From 6d2354264a7d92e1a1d9163eec9e2c9df239b159 Mon Sep 17 00:00:00 2001 From: couriersud Date: Thu, 26 Jan 2017 21:22:59 +0100 Subject: Do not derive other classes from std::vector. More cleanup. (nw) --- src/lib/netlist/plib/pfunction.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/netlist/plib/pfunction.cpp') 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 &inputs, const pstring expr) void pfunction::compile_postfix(const std::vector &inputs, const pstring expr) { - plib::pstring_vector_t cmds(expr, " "); + std::vector cmds(plib::psplit(expr, " ")); compile_postfix(inputs, cmds, expr); } @@ -110,9 +110,9 @@ void pfunction::compile_infix(const std::vector &inputs, const pstring { // Shunting-yard infix parsing std::vector sep = {"(", ")", ",", "*", "/", "+", "-", "^"}; - plib::pstring_vector_t sexpr(expr.replace(" ",""), sep); + std::vector sexpr(plib::psplit(expr.replace(" ",""), sep)); std::stack opstk; - plib::pstring_vector_t postfix; + std::vector postfix; //printf("dbg: %s\n", expr.c_str()); for (unsigned i = 0; i < sexpr.size(); i++) -- cgit v1.2.3-70-g09d2