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 2014-04-21 20:08:53 +10:00
parent a2d640ed78
commit 86514b460f
6 changed files with 156 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -35,6 +35,7 @@ BUILD_LIST+=exprtk_simple_example_08
BUILD_LIST+=exprtk_simple_example_09 BUILD_LIST+=exprtk_simple_example_09
BUILD_LIST+=exprtk_simple_example_10 BUILD_LIST+=exprtk_simple_example_10
BUILD_LIST+=exprtk_simple_example_11 BUILD_LIST+=exprtk_simple_example_11
BUILD_LIST+=exprtk_simple_example_12
all: $(BUILD_LIST) all: $(BUILD_LIST)
@ -77,6 +78,9 @@ exprtk_simple_example_10: exprtk_simple_example_10.cpp exprtk.hpp
exprtk_simple_example_11: exprtk_simple_example_11.cpp exprtk.hpp exprtk_simple_example_11: exprtk_simple_example_11.cpp exprtk.hpp
$(COMPILER) $(OPTIONS) exprtk_simple_example_11 exprtk_simple_example_11.cpp $(LINKER_OPT) $(COMPILER) $(OPTIONS) exprtk_simple_example_11 exprtk_simple_example_11.cpp $(LINKER_OPT)
exprtk_simple_example_12: exprtk_simple_example_12.cpp exprtk.hpp
$(COMPILER) $(OPTIONS) exprtk_simple_example_12 exprtk_simple_example_12.cpp $(LINKER_OPT)
pgo: exprtk_test.cpp exprtk_benchmark.cpp exprtk.hpp pgo: exprtk_test.cpp exprtk_benchmark.cpp exprtk.hpp
$(COMPILER) $(BASE_OPTIONS) -O3 -march=native -fprofile-generate -o exprtk_benchmark exprtk_benchmark.cpp $(LINKER_OPT) $(COMPILER) $(BASE_OPTIONS) -O3 -march=native -fprofile-generate -o exprtk_benchmark exprtk_benchmark.cpp $(LINKER_OPT)
./exprtk_benchmark ./exprtk_benchmark
@ -96,6 +100,7 @@ strip_bin:
strip -s exprtk_simple_example_09 strip -s exprtk_simple_example_09
strip -s exprtk_simple_example_10 strip -s exprtk_simple_example_10
strip -s exprtk_simple_example_11 strip -s exprtk_simple_example_11
strip -s exprtk_simple_example_12
valgrind_check: valgrind_check:
valgrind --leak-check=full --show-reachable=yes --track-origins=yes -v ./exprtk_test valgrind --leak-check=full --show-reachable=yes --track-origins=yes -v ./exprtk_test
@ -111,6 +116,7 @@ valgrind_check:
valgrind --leak-check=full --show-reachable=yes --track-origins=yes -v ./exprtk_simple_example_09 valgrind --leak-check=full --show-reachable=yes --track-origins=yes -v ./exprtk_simple_example_09
valgrind --leak-check=full --show-reachable=yes --track-origins=yes -v ./exprtk_simple_example_10 valgrind --leak-check=full --show-reachable=yes --track-origins=yes -v ./exprtk_simple_example_10
valgrind --leak-check=full --show-reachable=yes --track-origins=yes -v ./exprtk_simple_example_11 valgrind --leak-check=full --show-reachable=yes --track-origins=yes -v ./exprtk_simple_example_11
valgrind --leak-check=full --show-reachable=yes --track-origins=yes -v ./exprtk_simple_example_12
clean: clean:
rm -f core.* *~ *.o *.bak *stackdump gmon.out *.gcda *.gcno *.gcnor *.gch rm -f core.* *~ *.o *.bak *stackdump gmon.out *.gcda *.gcno *.gcnor *.gch

128
exprtk.hpp
View File

@ -12151,10 +12151,15 @@ namespace exprtk
loop_counter_symbol = current_token_.value; loop_counter_symbol = current_token_.value;
if ( if (local_symbol_table_.is_variable(loop_counter_symbol))
!symbol_table_.is_variable (loop_counter_symbol) && {
!local_symbol_table_.is_variable(loop_counter_symbol) set_error(
) make_error(parser_error::e_syntax,
current_token_,
"ERR51 - For-loop variable '" +loop_counter_symbol+ "' is being shadowed by a previous declaration."));
return error_node();
}
else if (!symbol_table_.is_variable(loop_counter_symbol))
{ {
loop_counter = new T(T(0)); loop_counter = new T(T(0));
local_symbol_table_.add_variable(loop_counter_symbol,*loop_counter); local_symbol_table_.add_variable(loop_counter_symbol,*loop_counter);
@ -12166,7 +12171,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR51 - Failed to parse initializer of for-loop")); "ERR52 - Failed to parse initializer of for-loop"));
result = false; result = false;
} }
@ -12175,7 +12180,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR52 - Expected ';' after initializer of for-loop")); "ERR53 - Expected ';' after initializer of for-loop"));
result = false; result = false;
} }
} }
@ -12187,7 +12192,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR53 - Failed to parse condition of for-loop")); "ERR54 - Failed to parse condition of for-loop"));
result = false; result = false;
} }
else if (!token_is(token_t::e_eof)) else if (!token_is(token_t::e_eof))
@ -12195,7 +12200,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR54 - Expected ';' after condition section of for-loop")); "ERR55 - Expected ';' after condition section of for-loop"));
result = false; result = false;
} }
} }
@ -12207,7 +12212,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR55 - Failed to parse incrementor of for-loop")); "ERR56 - Failed to parse incrementor of for-loop"));
result = false; result = false;
} }
else if (!token_is(token_t::e_rbracket)) else if (!token_is(token_t::e_rbracket))
@ -12215,7 +12220,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR56 - Expected ')' after incrementor section of for-loop")); "ERR57 - Expected ')' after incrementor section of for-loop"));
result = false; result = false;
} }
} }
@ -12227,13 +12232,14 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR57 - Failed to parse body of for-loop")); "ERR58 - Failed to parse body of for-loop"));
result = false; result = false;
} }
} }
if (!result) if (!result)
{ {
local_symbol_table_.remove_variable(loop_counter_symbol);
free_node(node_allocator_,initializer); free_node(node_allocator_,initializer);
free_node(node_allocator_,condition ); free_node(node_allocator_,condition );
free_node(node_allocator_,incrementor); free_node(node_allocator_,incrementor);
@ -12269,7 +12275,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR58 - Expected keyword 'switch'")); "ERR59 - Expected keyword 'switch'"));
return error_node(); return error_node();
} }
@ -12282,7 +12288,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR59 - Expected '{' for call to switch statement")); "ERR60 - Expected '{' for call to switch statement"));
return error_node(); return error_node();
} }
@ -12293,7 +12299,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR60 - Expected either a 'case' or 'default' statement")); "ERR61 - Expected either a 'case' or 'default' statement"));
return error_node(); return error_node();
} }
@ -12309,7 +12315,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR61 - Expected ':' for case of switch statement")); "ERR62 - Expected ':' for case of switch statement"));
return error_node(); return error_node();
} }
@ -12323,7 +12329,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR62 - Expected ';' at end of case for switch statement")); "ERR63 - Expected ';' at end of case for switch statement"));
return error_node(); return error_node();
} }
@ -12349,7 +12355,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR63 - Expected ':' for default of switch statement")); "ERR64 - Expected ':' for default of switch statement"));
return error_node(); return error_node();
} }
@ -12361,7 +12367,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR64 - Expected ';' at end of default for switch statement")); "ERR65 - Expected ';' at end of default for switch statement"));
return error_node(); return error_node();
} }
@ -12375,7 +12381,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR65 - Expected '}' at end of switch statement")); "ERR66 - Expected '}' at end of switch statement"));
return error_node(); return error_node();
} }
@ -12397,7 +12403,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR66 - Expected token '[*]'")); "ERR67 - Expected token '[*]'"));
return error_node(); return error_node();
} }
@ -12410,7 +12416,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR67 - Expected '{' for call to [*] statement")); "ERR68 - Expected '{' for call to [*] statement"));
return error_node(); return error_node();
} }
@ -12421,7 +12427,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR68 - Expected a 'case' statement for multi-switch.")); "ERR69 - Expected a 'case' statement for multi-switch."));
return error_node(); return error_node();
} }
@ -12436,7 +12442,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR69 - Expected ':' for case of [*] statement")); "ERR70 - Expected ':' for case of [*] statement"));
return error_node(); return error_node();
} }
@ -12449,7 +12455,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR70 - Expected ';' at end of case for [*] statement")); "ERR71 - Expected ';' at end of case for [*] statement"));
return error_node(); return error_node();
} }
@ -12478,7 +12484,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR71 - Expected '}' at end of [*] statement")); "ERR72 - Expected '}' at end of [*] statement"));
return error_node(); return error_node();
} }
@ -12517,7 +12523,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR72 - Unsupported vararg function: " + symbol)); "ERR73 - Unsupported vararg function: " + symbol));
return error_node(); return error_node();
} }
@ -12529,7 +12535,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR73 - Expected '(' for call to vararg function: " + symbol)); "ERR74 - Expected '(' for call to vararg function: " + symbol));
return error_node(); return error_node();
} }
@ -12548,7 +12554,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR74 - Expected ',' for call to vararg function: " + symbol)); "ERR75 - Expected ',' for call to vararg function: " + symbol));
return error_node(); return error_node();
} }
} }
@ -12605,7 +12611,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR75 - Expected '" + token_t::to_str(close_bracket) + "' for call to multi-sequence" + "ERR76 - Expected '" + token_t::to_str(close_bracket) + "' for call to multi-sequence" +
((!source.empty()) ? std::string(" section of " + source): ""))); ((!source.empty()) ? std::string(" section of " + source): "")));
return error_node(); return error_node();
} }
@ -12633,7 +12639,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR76 - Expected '" + details::to_str(seperator) + "' for call to multi-sequence section of " + source)); "ERR77 - Expected '" + details::to_str(seperator) + "' for call to multi-sequence section of " + source));
return error_node(); return error_node();
} }
@ -12759,7 +12765,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR77 - Expected '[' for start of range")); "ERR78 - Expected '[' for start of range"));
return false; return false;
} }
@ -12777,7 +12783,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR78 - Failed parse begin section of range")); "ERR79 - Failed parse begin section of range"));
return false; return false;
} }
@ -12795,7 +12801,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR79 - Range lower bound less than zero! Constraint: r0 >= 0")); "ERR80 - Range lower bound less than zero! Constraint: r0 >= 0"));
return false; return false;
} }
} }
@ -12810,7 +12816,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR80 - Expected ':' for break in range")); "ERR81 - Expected ':' for break in range"));
rp.free(); rp.free();
return false; return false;
} }
@ -12830,7 +12836,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR81 - Failed parse end section of range")); "ERR82 - Failed parse end section of range"));
rp.free(); rp.free();
return false; return false;
@ -12849,7 +12855,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR82 - Range upper bound less than zero! Constraint: r1 >= 0")); "ERR83 - Range upper bound less than zero! Constraint: r1 >= 0"));
return false; return false;
} }
} }
@ -12864,7 +12870,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR83 - Expected ']' for start of range")); "ERR84 - Expected ']' for start of range"));
rp.free(); rp.free();
return false; return false;
} }
@ -12880,7 +12886,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR84 - Invalid range, Constraint: r0 <= r1")); "ERR85 - Invalid range, Constraint: r0 <= r1"));
return false; return false;
} }
} }
@ -12905,7 +12911,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR85 - Unknown string symbol")); "ERR86 - Unknown string symbol"));
return error_node(); return error_node();
} }
@ -12968,7 +12974,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR86 - Overflow in range for string: '" + const_str + "'[" + "ERR87 - 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(rp.n0_c.second) : "?") + ":" +
(rp.n1_c.first ? details::to_str(rp.n1_c.second) : "?") + "]")); (rp.n1_c.first ? details::to_str(rp.n1_c.second) : "?") + "]"));
return error_node(); return error_node();
@ -12997,7 +13003,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR87 - Expected '[' for index of vector: '" + symbol + "'")); "ERR88 - Expected '[' for index of vector: '" + symbol + "'"));
return error_node(); return error_node();
} }
else if (token_is(token_t::e_rsqrbracket)) else if (token_is(token_t::e_rsqrbracket))
@ -13009,7 +13015,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR88 - Failed to parse index for vector: '" + symbol + "'")); "ERR89 - Failed to parse index for vector: '" + symbol + "'"));
return error_node(); return error_node();
} }
else if (!token_is(token_t::e_rsqrbracket)) else if (!token_is(token_t::e_rsqrbracket))
@ -13017,7 +13023,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR89 - Expected ']' for index of vector: '" + symbol + "'")); "ERR90 - Expected ']' for index of vector: '" + symbol + "'"));
return error_node(); return error_node();
} }
@ -13039,7 +13045,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR90 - Expected '(' for call to vararg function: " + vararg_function_name)); "ERR91 - Expected '(' for call to vararg function: " + vararg_function_name));
return error_node(); return error_node();
} }
@ -13060,7 +13066,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR91 - Expected ',' for call to vararg function: " + vararg_function_name)); "ERR92 - Expected ',' for call to vararg function: " + vararg_function_name));
return error_node(); return error_node();
} }
} }
@ -13089,7 +13095,7 @@ namespace exprtk
p.set_error( p.set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
p.current_token(), p.current_token(),
"ERR92 - Expected '(' for special function")); "ERR93 - Expected '(' for special function"));
return error_node(); return error_node();
} }
@ -13107,7 +13113,7 @@ namespace exprtk
p.set_error( p.set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
p.current_token(), p.current_token(),
"ERR93 - Expected ',' before next parameter of special function")); "ERR94 - Expected ',' before next parameter of special function"));
return p.error_node(); return p.error_node();
} }
} }
@ -13133,7 +13139,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_token, make_error(parser_error::e_token,
current_token_, current_token_,
"ERR94 - Invalid special function[1]: " + current_token_.value)); "ERR95 - Invalid special function[1]: " + current_token_.value));
return error_node(); return error_node();
} }
@ -13144,7 +13150,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_token, make_error(parser_error::e_token,
current_token_, current_token_,
"ERR95 - Invalid special function[2]: " + current_token_.value)); "ERR96 - Invalid special function[2]: " + current_token_.value));
return error_node(); return error_node();
} }
@ -13236,7 +13242,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR96 - Invalid number of parameters for function: " + symbol)); "ERR97 - Invalid number of parameters for function: " + symbol));
return error_node(); return error_node();
} }
} }
@ -13248,7 +13254,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR97 - Failed to generate node for function: '" + symbol + "'")); "ERR98 - Failed to generate node for function: '" + symbol + "'"));
return error_node(); return error_node();
} }
} }
@ -13268,7 +13274,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR98 - Failed to generate node for vararg function: '" + symbol + "'")); "ERR99 - Failed to generate node for vararg function: '" + symbol + "'"));
return error_node(); return error_node();
} }
} }
@ -13318,7 +13324,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_symtab, make_error(parser_error::e_symtab,
current_token_, current_token_,
"ERR99 - Failed to create variable: '" + symbol + "'")); "ERR100 - Failed to create variable: '" + symbol + "'"));
return error_node(); return error_node();
} }
@ -13327,7 +13333,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR100 - Undefined variable or function: '" + symbol + "'")); "ERR101 - Undefined variable or function: '" + symbol + "'"));
return error_node(); return error_node();
} }
@ -13385,7 +13391,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_symtab, make_error(parser_error::e_symtab,
current_token_, current_token_,
"ERR101 - Variable or function detected, yet symbol-table is invalid, Symbol: " + current_token_.value)); "ERR102 - Variable or function detected, yet symbol-table is invalid, Symbol: " + current_token_.value));
return error_node(); return error_node();
} }
} }
@ -13409,7 +13415,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_numeric, make_error(parser_error::e_numeric,
current_token_, current_token_,
"ERR102 - Failed to convert '" + current_token_.value + "' to a number.")); "ERR103 - Failed to convert '" + current_token_.value + "' to a number."));
return error_node(); return error_node();
} }
} }
@ -13433,7 +13439,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR103 - Expected ')' instead of: '" + current_token_.value + "'")); "ERR104 - Expected ')' instead of: '" + current_token_.value + "'"));
return error_node(); return error_node();
} }
} }
@ -13447,7 +13453,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR104 - Expected ']' instead of: '" + current_token_.value + "'")); "ERR105 - Expected ']' instead of: '" + current_token_.value + "'"));
return error_node(); return error_node();
} }
} }
@ -13461,7 +13467,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR105 - Expected '}' instead of: '" + current_token_.value + "'")); "ERR106 - Expected '}' instead of: '" + current_token_.value + "'"));
return error_node(); return error_node();
} }
} }
@ -13484,7 +13490,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR106 - Premature end of expression[1]")); "ERR107 - Premature end of expression[1]"));
return error_node(); return error_node();
} }
else else
@ -13492,7 +13498,7 @@ namespace exprtk
set_error( set_error(
make_error(parser_error::e_syntax, make_error(parser_error::e_syntax,
current_token_, current_token_,
"ERR107 - Premature end of expression[2]")); "ERR108 - Premature end of expression[2]"));
return error_node(); return error_node();
} }

6
exprtk_simple_example_06.cpp
View File

@ -24,9 +24,9 @@
template<typename T> template<typename T>
void vector_function() void vector_function()
{ {
typedef exprtk::symbol_table<double> symbol_table_t; typedef exprtk::symbol_table<T> symbol_table_t;
typedef exprtk::expression<double> expression_t; typedef exprtk::expression<T> expression_t;
typedef exprtk::parser<double> parser_t; typedef exprtk::parser<T> parser_t;
std::string expression_string = std::string expression_string =
" for (i := 0; i < min(x[],y[],z[]); i += 1) " " for (i := 0; i < min(x[],y[],z[]); i += 1) "

10
exprtk_simple_example_11.cpp
View File

@ -24,6 +24,10 @@
template<typename T> template<typename T>
void square_wave2() void square_wave2()
{ {
typedef exprtk::symbol_table<T> symbol_table_t;
typedef exprtk::expression<T> expression_t;
typedef exprtk::parser<T> parser_t;
std::string expr_string = " r := 0; " std::string expr_string = " r := 0; "
" for(i := 0; i < 1000; i += 1) " " for(i := 0; i < 1000; i += 1) "
" { " " { "
@ -37,16 +41,16 @@ void square_wave2()
T t = T(0); T t = T(0);
T a = T(10); T a = T(10);
exprtk::symbol_table<T> symbol_table; symbol_table_t symbol_table;
symbol_table.add_variable("f",f); symbol_table.add_variable("f",f);
symbol_table.add_variable("t",t); symbol_table.add_variable("t",t);
symbol_table.add_variable("a",a); symbol_table.add_variable("a",a);
symbol_table.add_constants(); symbol_table.add_constants();
exprtk::expression<T> expression; expression_t expression;
expression.register_symbol_table(symbol_table); expression.register_symbol_table(symbol_table);
exprtk::parser<T> parser; parser_t parser;
parser.enable_unknown_symbol_resolver(); parser.enable_unknown_symbol_resolver();
parser.compile(expr_string,expression); parser.compile(expr_string,expression);

71
exprtk_simple_example_12.cpp Normal file
View File

@ -0,0 +1,71 @@
/*
**************************************************************
* C++ Mathematical Expression Toolkit Library *
* *
* Simple Example 12 *
* Author: Arash Partow (1999-2014) *
* URL: http://www.partow.net/programming/exprtk/index.html *
* *
* Copyright notice: *
* Free use of the Mathematical Expression Toolkit Library is *
* permitted under the guidelines and in accordance with the *
* most current version of the Common Public License. *
* http://www.opensource.org/licenses/cpl1.0.php *
* *
**************************************************************
*/
#include <cstdio>
#include <string>
#include "exprtk.hpp"
template<typename T>
void bubble_sort()
{
typedef exprtk::symbol_table<T> symbol_table_t;
typedef exprtk::expression<T> expression_t;
typedef exprtk::parser<T> parser_t;
std::string expr_string =
" upper_bound := v[]; "
" repeat "
" swapped := false; "
" for(i := 0; i < upper_bound; i += 1) "
" { "
" for(j := i + 1; j < upper_bound; j += 1) "
" { "
" if (v[i] > v[j]) "
" { "
" temp := v[i]; "
" v[i] := v[j]; "
" v[j] := temp; "
" swapped := true; "
" }; "
" }; "
" }; "
" upper_bound -= 1; "
" until (not(swapped) or (upper_bound == 0)); ";
T v[] = { T(2.2), T(1.1), T(5.5), T(4.4), T(3.3) };
symbol_table_t symbol_table;
symbol_table.add_vector("v",v);
expression_t expression;
expression.register_symbol_table(symbol_table);
parser_t parser;
parser.enable_unknown_symbol_resolver();
parser.compile(expr_string,expression);
expression.value();
}
int main()
{
bubble_sort<double>();
return 0;
}

2
readme.txt
View File

@ -993,3 +993,5 @@ int main()
(12) exprtk_simple_example_08.cpp (12) exprtk_simple_example_08.cpp
(13) exprtk_simple_example_09.cpp (13) exprtk_simple_example_09.cpp
(14) exprtk_simple_example_10.cpp (14) exprtk_simple_example_10.cpp
(15) exprtk_simple_example_11.cpp
(16) exprtk_simple_example_12.cpp