From 7cabb8aaf490671aa7d4b722f825054936bd2a09 Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Wed, 29 Apr 2020 15:13:09 +0200 Subject: [PATCH] exp_parser:: user-defined variables take precedence --- util.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/util.cpp b/util.cpp index 04928814..c0bc059f 100644 --- a/util.cpp +++ b/util.cpp @@ -335,7 +335,9 @@ cld exp_parser::parse(int prio) { else if(next() == '(') at++, res = parsepar(); else { string number = next_token(); - if(number == "e") res = exp(1); + if(extra_params.count(number)) res = extra_params[number]; + else if(params.count(number)) res = params.at(number); + else if(number == "e") res = exp(1); else if(number == "i") res = cld(0, 1); else if(number == "p" || number == "pi") res = M_PI; else if(number == "" && next() == '-') { at++; res = -parse(prio); }