diff options
Diffstat (limited to 'src/lib/netlist/plib/pparser.cpp')
-rw-r--r-- | src/lib/netlist/plib/pparser.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/netlist/plib/pparser.cpp b/src/lib/netlist/plib/pparser.cpp index 359e4415d72..6c0fa79d7e4 100644 --- a/src/lib/netlist/plib/pparser.cpp +++ b/src/lib/netlist/plib/pparser.cpp @@ -197,7 +197,7 @@ ptokenizer::token_t ptokenizer::get_token_internal() c = getc(); } ungetc(); - token_id_t id = token_id_t(m_tokens.indexof(tokstr)); + token_id_t id(plib::container::indexof(m_tokens, tokstr)); if (id.id() >= 0) return token_t(id, tokstr); else @@ -225,14 +225,14 @@ ptokenizer::token_t ptokenizer::get_token_internal() /* expensive, check for single char tokens */ if (tokstr.len() == 1) { - token_id_t id = token_id_t(m_tokens.indexof(tokstr)); + token_id_t id(plib::container::indexof(m_tokens, tokstr)); if (id.id() >= 0) return token_t(id, tokstr); } c = getc(); } ungetc(); - token_id_t id = token_id_t(m_tokens.indexof(tokstr)); + token_id_t id(plib::container::indexof(m_tokens, tokstr)); if (id.id() >= 0) return token_t(id, tokstr); else @@ -267,7 +267,7 @@ ppreprocessor::ppreprocessor() m_expr_sep.push_back(" "); m_expr_sep.push_back("\t"); - m_defines.add("__PLIB_PREPROCESSOR__", define_t("__PLIB_PREPROCESSOR__", "1")); + m_defines.insert({"__PLIB_PREPROCESSOR__", define_t("__PLIB_PREPROCESSOR__", "1")}); } void ppreprocessor::error(const pstring &err) @@ -349,9 +349,9 @@ double ppreprocessor::expr(const pstring_vector_t &sexpr, std::size_t &start, in ppreprocessor::define_t *ppreprocessor::get_define(const pstring &name) { - int idx = m_defines.index_of(name); - if (idx >= 0) - return &m_defines.value_at(idx); + auto idx = m_defines.find(name); + if (idx != m_defines.end()) + return &idx->second; else return nullptr; } @@ -440,7 +440,7 @@ pstring ppreprocessor::process_line(const pstring &line) { if (lti.size() != 3) error("PREPRO: only simple defines allowed: " + line); - m_defines.add(lti[1], define_t(lti[1], lti[2])); + m_defines.insert({lti[1], define_t(lti[1], lti[2])}); } } else |