diff options
Diffstat (limited to 'src/lib/netlist/plib/pparser.cpp')
-rw-r--r-- | src/lib/netlist/plib/pparser.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/netlist/plib/pparser.cpp b/src/lib/netlist/plib/pparser.cpp index 4b5d7995658..9362ba7de0d 100644 --- a/src/lib/netlist/plib/pparser.cpp +++ b/src/lib/netlist/plib/pparser.cpp @@ -255,16 +255,16 @@ ATTR_COLD void ptokenizer::error(const pstring &errs) ppreprocessor::ppreprocessor() : m_ifflag(0), m_level(0), m_lineno(0) { - m_expr_sep.add("!"); - m_expr_sep.add("("); - m_expr_sep.add(")"); - m_expr_sep.add("+"); - m_expr_sep.add("-"); - m_expr_sep.add("*"); - m_expr_sep.add("/"); - m_expr_sep.add("=="); - m_expr_sep.add(" "); - m_expr_sep.add("\t"); + m_expr_sep.push_back("!"); + m_expr_sep.push_back("("); + m_expr_sep.push_back(")"); + m_expr_sep.push_back("+"); + m_expr_sep.push_back("-"); + m_expr_sep.push_back("*"); + m_expr_sep.push_back("/"); + m_expr_sep.push_back("=="); + m_expr_sep.push_back(" "); + m_expr_sep.push_back("\t"); m_defines.add("__PLIB_PREPROCESSOR__", define_t("__PLIB_PREPROCESSOR__", "1")); } @@ -276,7 +276,7 @@ void ppreprocessor::error(const pstring &err) -double ppreprocessor::expr(const pstring_list_t &sexpr, std::size_t &start, int prio) +double ppreprocessor::expr(const pstring_vector_t &sexpr, std::size_t &start, int prio) { double val; pstring tok=sexpr[start]; @@ -357,7 +357,7 @@ ppreprocessor::define_t *ppreprocessor::get_define(const pstring &name) pstring ppreprocessor::replace_macros(const pstring &line) { - pstring_list_t elems = pstring_list_t::splitexpr(line, m_expr_sep); + pstring_vector_t elems(line, m_expr_sep); pstringbuffer ret = ""; for (std::size_t i=0; i<elems.size(); i++) { @@ -370,7 +370,7 @@ pstring ppreprocessor::replace_macros(const pstring &line) return ret; } -static pstring catremainder(const pstring_list_t &elems, std::size_t start, pstring sep) +static pstring catremainder(const pstring_vector_t &elems, std::size_t start, pstring sep) { pstringbuffer ret = ""; for (std::size_t i=start; i<elems.size(); i++) @@ -389,13 +389,13 @@ pstring ppreprocessor::process_line(const pstring &line) // FIXME ... revise and extend macro handling if (lt.startsWith("#")) { - pstring_list_t lti(lt, " ", true); + pstring_vector_t lti(lt, " ", true); if (lti[0].equals("#if")) { m_level++; std::size_t start = 0; lt = replace_macros(lt); - pstring_list_t t = pstring_list_t::splitexpr(lt.substr(3).replace(" ",""), m_expr_sep); + pstring_vector_t t(lt.substr(3).replace(" ",""), m_expr_sep); int val = expr(t, start, 0); if (val == 0) m_ifflag |= (1 << m_level); |