diff options
author | 2020-04-19 13:03:44 +0200 | |
---|---|---|
committer | 2020-04-19 13:03:44 +0200 | |
commit | 44220a8d39d558ed0edd593c7ab8d927df1977b4 (patch) | |
tree | d7c91d0229c1f000bb6db9161c88885c0f495936 /src/lib/netlist/plib/pfunction.cpp | |
parent | 12cc44fe370371e617f4821ef91e16bd139acb1d (diff) |
netlist: code maintenance on pfunction. (nw)
Diffstat (limited to 'src/lib/netlist/plib/pfunction.cpp')
-rw-r--r-- | src/lib/netlist/plib/pfunction.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
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 <typename NT> - void pfunction<NT>::compile(const pstring &expr, const std::vector<pstring> &inputs) noexcept(false) + void pfunction<NT>::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 <typename NT> - void pfunction<NT>::compile_postfix(const pstring &expr, const std::vector<pstring> &inputs) noexcept(false) + void pfunction<NT>::compile_postfix(const pstring &expr, const inputs_container &inputs) noexcept(false) { std::vector<pstring> cmds(plib::psplit(expr, " ")); compile_postfix(inputs, cmds, expr); } template <typename NT> - void pfunction<NT>::compile_postfix(const std::vector<pstring> &inputs, + void pfunction<NT>::compile_postfix(const inputs_container &inputs, const std::vector<pstring> &cmds, const pstring &expr) noexcept(false) { m_precompiled.clear(); @@ -118,7 +118,7 @@ namespace plib { } template <typename NT> - void pfunction<NT>::compile_infix(const pstring &expr, const std::vector<pstring> &inputs) + void pfunction<NT>::compile_infix(const pstring &expr, const inputs_container &inputs) { // Shunting-yard infix parsing std::vector<pstring> sep = {"(", ")", ",", "*", "/", "+", "-", "^"}; @@ -267,11 +267,11 @@ namespace plib { break; template <typename NT> - NT pfunction<NT>::evaluate(const std::vector<NT> &values) noexcept + NT pfunction<NT>::evaluate(const values_container &values) noexcept { - std::array<NT, 20> stack = { plib::constants<NT>::zero() }; + std::array<value_type, 20> stack = { plib::constants<value_type>::zero() }; unsigned ptr = 0; - stack[0] = plib::constants<NT>::zero(); + stack[0] = plib::constants<value_type>::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<NT>(m_lfsr); + stack[ptr++] = lfsr_random<value_type>(m_lfsr); break; case PUSH_INPUT: stack[ptr++] = values[static_cast<unsigned>(rc.m_param)]; |