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

Merge 53c5a173c1 into 46877b604c

This commit is contained in:
Florian Lüke 2018-05-28 10:10:45 +00:00 committed by GitHub
parent 46877b604c 53c5a173c1
commit 044b0eefdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
exprtk.hpp
View File

@ -17337,8 +17337,8 @@ namespace exprtk
{ {
/* /*
Function will return true if symbol_name exists as either a Function will return true if symbol_name exists as either a
reserved symbol, variable, stringvar or function name in any reserved symbol, variable, stringvar, vector or function name in
of the type stores. any of the type stores.
*/ */
if (!valid()) if (!valid())
return false; return false;
@ -17348,6 +17348,8 @@ namespace exprtk
else if (local_data().stringvar_store.symbol_exists(symbol_name)) else if (local_data().stringvar_store.symbol_exists(symbol_name))
return true; return true;
#endif #endif
else if (local_data().vector_store.symbol_exists(symbol_name))
return true;
else if (local_data().function_store.symbol_exists(symbol_name)) else if (local_data().function_store.symbol_exists(symbol_name))
return true; return true;
else if (check_reserved_symb && local_data().is_reserved_symbol(symbol_name)) else if (check_reserved_symb && local_data().is_reserved_symbol(symbol_name))