summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist/plib/pparser.cpp
diff options
context:
space:
mode:
author couriersud <couriersud@gmx.org>2017-01-26 21:22:59 +0100
committer couriersud <couriersud@gmx.org>2017-01-27 15:22:18 +0100
commit6d2354264a7d92e1a1d9163eec9e2c9df239b159 (patch)
tree8021fd3d56893fbfce73be0ade97ef81bf94bd9b /src/lib/netlist/plib/pparser.cpp
parent5c88873a8747b751994216e269128a6d26bd4a04 (diff)
Do not derive other classes from std::vector. More cleanup. (nw)
Diffstat (limited to 'src/lib/netlist/plib/pparser.cpp')
-rw-r--r--src/lib/netlist/plib/pparser.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/netlist/plib/pparser.cpp b/src/lib/netlist/plib/pparser.cpp
index 583e9e9e20c..6604c07dcb7 100644
--- a/src/lib/netlist/plib/pparser.cpp
+++ b/src/lib/netlist/plib/pparser.cpp
@@ -384,7 +384,7 @@ ppreprocessor::define_t *ppreprocessor::get_define(const pstring &name)
pstring ppreprocessor::replace_macros(const pstring &line)
{
- pstring_vector_t elems(line, m_expr_sep);
+ std::vector<pstring> elems(psplit(line, m_expr_sep));
pstringbuffer ret = "";
for (auto & elem : elems)
{
@@ -397,7 +397,7 @@ pstring ppreprocessor::replace_macros(const pstring &line)
return ret;
}
-static pstring catremainder(const pstring_vector_t &elems, std::size_t start, pstring sep)
+static pstring catremainder(const std::vector<pstring> &elems, std::size_t start, pstring sep)
{
pstringbuffer ret = "";
for (auto & elem : elems)
@@ -416,13 +416,13 @@ pstring ppreprocessor::process_line(const pstring &line)
// FIXME ... revise and extend macro handling
if (lt.startsWith("#"))
{
- pstring_vector_t lti(lt, " ", true);
+ std::vector<pstring> lti(psplit(lt, " ", true));
if (lti[0].equals("#if"))
{
m_level++;
std::size_t start = 0;
lt = replace_macros(lt);
- pstring_vector_t t(lt.substr(3).replace(" ",""), m_expr_sep);
+ std::vector<pstring> t(psplit(lt.substr(3).replace(" ",""), m_expr_sep));
int val = static_cast<int>(expr(t, start, 0));
if (val == 0)
m_ifflag |= (1 << m_level);