diff options
author | 2016-03-21 08:27:06 +0100 | |
---|---|---|
committer | 2016-03-21 08:27:06 +0100 | |
commit | a99df788017c2bf5a56034d4f9152bf8ab95a168 (patch) | |
tree | 3beec27b413c75b8f9f88199519e45fd07959bf8 /src/lib/netlist/plib/pparser.h | |
parent | b224d9a77ad6483daf2b60b75dbdc323a3bcd4b0 (diff) | |
parent | 3afd990226a2c647290579bebb5537bd0fd3faac (diff) |
Merge with master
Diffstat (limited to 'src/lib/netlist/plib/pparser.h')
-rw-r--r-- | src/lib/netlist/plib/pparser.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/netlist/plib/pparser.h b/src/lib/netlist/plib/pparser.h index 08294677328..cf122fec7f8 100644 --- a/src/lib/netlist/plib/pparser.h +++ b/src/lib/netlist/plib/pparser.h @@ -96,7 +96,7 @@ public: token_id_t register_token(pstring token) { - m_tokens.add(token); + m_tokens.push_back(token); return token_id_t(m_tokens.size() - 1); } @@ -136,7 +136,7 @@ private: pstring m_identifier_chars; pstring m_number_chars; pstring m_number_chars_start; - plist_t<pstring> m_tokens; + pvector_t<pstring> m_tokens; pstring m_whitespace; pstring::code_t m_string; @@ -174,7 +174,7 @@ protected: postream &process_i(pistream &istrm, postream &ostrm); - double expr(const pstring_list_t &sexpr, std::size_t &start, int prio); + double expr(const pstring_vector_t &sexpr, std::size_t &start, int prio); define_t *get_define(const pstring &name); @@ -187,7 +187,7 @@ private: pstring process_line(const pstring &line); phashmap_t<pstring, define_t> m_defines; - pstring_list_t m_expr_sep; + pstring_vector_t m_expr_sep; //pstringbuffer m_ret; UINT32 m_ifflag; // 31 if levels |