xfygogo
/
exprtk
mirror of https://github.com/ArashPartow/exprtk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

C++ Mathematical Expression Library (ExprTk) http://www.partow.net/programming/exprtk/index.html

This commit is contained in:
Arash Partow 2015-04-25 22:49:14 +10:00
parent 6975ceb069
commit 9aecd7592a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
exprtk.hpp
View File

@ -19309,7 +19309,7 @@ namespace exprtk
return error_node(); return error_node();
} }
expression_node_ptr default_statement = parse_expression(); expression_node_ptr default_statement = parse_multi_sequence("switch-default");
if (0 == default_statement) if (0 == default_statement)
return error_node(); return error_node();
@ -31916,11 +31916,18 @@ namespace exprtk
mod_expression += " var " + input_var_list[i] + "{};\n"; mod_expression += " var " + input_var_list[i] + "{};\n";
} }
mod_expression += "~{" + expression + "};"; if (
('{' == expression.front()) &&
('}' == expression.back ())
)
mod_expression += "~" + expression + ";";
else
mod_expression += "~{" + expression + "};";
if (!parser_.compile(mod_expression,compiled_expression)) if (!parser_.compile(mod_expression,compiled_expression))
{ {
exprtk_debug(("Error: %s\n",parser_.error().c_str())); exprtk_debug(("Compositor error: %s\n",parser_.error().c_str()));
exprtk_debug(("Compositor modified expression: \n%s\n",mod_expression.c_str()));
return false; return false;
} }