From 44220a8d39d558ed0edd593c7ab8d927df1977b4 Mon Sep 17 00:00:00 2001 From: couriersud Date: Sun, 19 Apr 2020 13:03:44 +0200 Subject: netlist: code maintenance on pfunction. (nw) --- src/lib/netlist/plib/pfunction.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 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 31ee9397ec1..21f61643fea 100644 --- a/src/lib/netlist/plib/pfunction.cpp +++ b/src/lib/netlist/plib/pfunction.cpp @@ -15,7 +15,7 @@ namespace plib { template - void pfunction::compile(const pstring &expr, const std::vector &inputs) noexcept(false) + void pfunction::compile(const pstring &expr, const inputs_container &inputs) noexcept(false) { if (plib::startsWith(expr, "rpn:")) compile_postfix(expr.substr(4), inputs); @@ -24,14 +24,14 @@ namespace plib { } template - void pfunction::compile_postfix(const pstring &expr, const std::vector &inputs) noexcept(false) + void pfunction::compile_postfix(const pstring &expr, const inputs_container &inputs) noexcept(false) { std::vector cmds(plib::psplit(expr, " ")); compile_postfix(inputs, cmds, expr); } template - void pfunction::compile_postfix(const std::vector &inputs, + void pfunction::compile_postfix(const inputs_container &inputs, const std::vector &cmds, const pstring &expr) noexcept(false) { m_precompiled.clear(); @@ -118,7 +118,7 @@ namespace plib { } template - void pfunction::compile_infix(const pstring &expr, const std::vector &inputs) + void pfunction::compile_infix(const pstring &expr, const inputs_container &inputs) { // Shunting-yard infix parsing std::vector sep = {"(", ")", ",", "*", "/", "+", "-", "^"}; @@ -267,11 +267,11 @@ namespace plib { break; template - NT pfunction::evaluate(const std::vector &values) noexcept + NT pfunction::evaluate(const values_container &values) noexcept { - std::array stack = { plib::constants::zero() }; + std::array stack = { plib::constants::zero() }; unsigned ptr = 0; - stack[0] = plib::constants::zero(); + stack[0] = plib::constants::zero(); for (auto &rc : m_precompiled) { switch (rc.m_cmd) @@ -287,7 +287,7 @@ namespace plib { OP(MIN, 1, std::min(ST2, ST1)) OP(TRUNC, 0, plib::trunc(ST2)) case RAND: - stack[ptr++] = lfsr_random(m_lfsr); + stack[ptr++] = lfsr_random(m_lfsr); break; case PUSH_INPUT: stack[ptr++] = values[static_cast(rc.m_param)]; -- cgit v1.2.3-70-g09d2