mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-06-23 13:43:19 +00:00
Code Issues Releases Wiki Activity

exp_parser:: user-defined variables take precedence

Browse Source
This commit is contained in:
Zeno Rogue 2020-04-29 15:13:09 +02:00
parent fa11bc6c27
commit 7cabb8aaf4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util.cpp
View File

@ -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); }