diff options
author | 2017-01-26 21:22:59 +0100 | |
---|---|---|
committer | 2017-01-27 15:22:18 +0100 | |
commit | 6d2354264a7d92e1a1d9163eec9e2c9df239b159 (patch) | |
tree | 8021fd3d56893fbfce73be0ade97ef81bf94bd9b /src/lib/netlist/plib/pfunction.cpp | |
parent | 5c88873a8747b751994216e269128a6d26bd4a04 (diff) |
Do not derive other classes from std::vector. More cleanup. (nw)
Diffstat (limited to 'src/lib/netlist/plib/pfunction.cpp')
-rw-r--r-- | src/lib/netlist/plib/pfunction.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/netlist/plib/pfunction.cpp b/src/lib/netlist/plib/pfunction.cpp index 4736d047bbd..b457c940021 100644 --- a/src/lib/netlist/plib/pfunction.cpp +++ b/src/lib/netlist/plib/pfunction.cpp @@ -24,7 +24,7 @@ void pfunction::compile(const std::vector<pstring> &inputs, const pstring expr) void pfunction::compile_postfix(const std::vector<pstring> &inputs, const pstring expr) { - plib::pstring_vector_t cmds(expr, " "); + std::vector<pstring> cmds(plib::psplit(expr, " ")); compile_postfix(inputs, cmds, expr); } @@ -110,9 +110,9 @@ void pfunction::compile_infix(const std::vector<pstring> &inputs, const pstring { // Shunting-yard infix parsing std::vector<pstring> sep = {"(", ")", ",", "*", "/", "+", "-", "^"}; - plib::pstring_vector_t sexpr(expr.replace(" ",""), sep); + std::vector<pstring> sexpr(plib::psplit(expr.replace(" ",""), sep)); std::stack<pstring> opstk; - plib::pstring_vector_t postfix; + std::vector<pstring> postfix; //printf("dbg: %s\n", expr.c_str()); for (unsigned i = 0; i < sexpr.size(); i++) |