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-08-21 13:10:25 +10:00
parent 16a0e6b5ee
commit b8e8b9502b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
exprtk.hpp
View File

@ -4123,7 +4123,7 @@ namespace exprtk
e_sf4ext60 = 2060 e_sf4ext60 = 2060
}; };
std::string to_str(const operator_type opr) inline std::string to_str(const operator_type opr)
{ {
switch (opr) switch (opr)
{ {
@ -20825,8 +20825,8 @@ namespace exprtk
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token(), current_token(),
"ERR102 - Overflow in range for string: '" + const_str + "'[" + "ERR102 - Overflow in range for string: '" + const_str + "'[" +
(rp.n0_c.first ? details::to_str(rp.n0_c.second) : "?") + ":" + (rp.n0_c.first ? details::to_str(static_cast<int>(rp.n0_c.second)) : "?") + ":" +
(rp.n1_c.first ? details::to_str(rp.n1_c.second) : "?") + "]")); (rp.n1_c.first ? details::to_str(static_cast<int>(rp.n1_c.second)) : "?") + "]"));
return error_node(); return error_node();
} }
@ -20979,7 +20979,7 @@ namespace exprtk
current_token(), current_token(),
"ERR109 - Invalid number of parameters to call to vararg function: " "ERR109 - Invalid number of parameters to call to vararg function: "
+ vararg_function_name + ", require at least " + vararg_function_name + ", require at least "
+ details::to_str( vararg_function->min_num_args()) + " parameters")); + details::to_str(static_cast<int>(vararg_function->min_num_args())) + " parameters"));
return error_node(); return error_node();
} }
@ -20990,7 +20990,7 @@ namespace exprtk
current_token(), current_token(),
"ERR110 - Invalid number of parameters to call to vararg function: " "ERR110 - Invalid number of parameters to call to vararg function: "
+ vararg_function_name + ", require no more than " + vararg_function_name + ", require no more than "
+ details::to_str( vararg_function->max_num_args()) + " parameters")); + details::to_str(static_cast<int>(vararg_function->max_num_args())) + " parameters"));
return error_node(); return error_node();
} }