diff options
author | Serge Bazanski <serge@bazanski.pl> | 2018-07-14 20:24:20 +0100 |
---|---|---|
committer | Serge Bazanski <serge@bazanski.pl> | 2018-07-14 20:24:20 +0100 |
commit | 59a790cd00421d14120927fbb1718da8cd77e3c4 (patch) | |
tree | 1fef01a39c3856341bcbfb6f9c5ed8d97622127d /common/nextpnr.cc | |
parent | 1b5c1b028e0a44c6171aa2b95809e2b6edb9c13c (diff) | |
download | nextpnr-59a790cd00421d14120927fbb1718da8cd77e3c4.tar.gz nextpnr-59a790cd00421d14120927fbb1718da8cd77e3c4.tar.bz2 nextpnr-59a790cd00421d14120927fbb1718da8cd77e3c4.zip |
Refactor IdString functionality into IdStringDB
This lets us more precisely control the lifetime of IdString databases
in contexts/arches.
Diffstat (limited to 'common/nextpnr.cc')
-rw-r--r-- | common/nextpnr.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/nextpnr.cc b/common/nextpnr.cc index 3861e5fe..c60d0e86 100644 --- a/common/nextpnr.cc +++ b/common/nextpnr.cc @@ -27,7 +27,7 @@ assertion_failure::assertion_failure(std::string msg, std::string expr_str, std: { } -void IdString::set(const BaseCtx *ctx, const std::string &s) +void IdString::set(const IdStringDB *ctx, const std::string &s) { auto it = ctx->idstring_str_to_idx->find(s); if (it == ctx->idstring_str_to_idx->end()) { @@ -39,11 +39,11 @@ void IdString::set(const BaseCtx *ctx, const std::string &s) } } -const std::string &IdString::str(const BaseCtx *ctx) const { return *ctx->idstring_idx_to_str->at(index); } +const std::string &IdString::str(const IdStringDB *ctx) const { return *ctx->idstring_idx_to_str->at(index); } -const char *IdString::c_str(const BaseCtx *ctx) const { return str(ctx).c_str(); } +const char *IdString::c_str(const IdStringDB *ctx) const { return str(ctx).c_str(); } -void IdString::initialize_add(const BaseCtx *ctx, const char *s, int idx) +void IdString::initialize_add(const IdStringDB *ctx, const char *s, int idx) { NPNR_ASSERT(ctx->idstring_str_to_idx->count(s) == 0); NPNR_ASSERT(int(ctx->idstring_idx_to_str->size()) == idx); |