Update ExprTk to 0.0.3

Signed-off-by: Arash Partow <[email protected]>
os-fpga · Jan 1, 2024 · 896a92d · 896a92d
1 parent c10906b
commit 896a92d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -6,7 +6,8 @@
 	url = https://github.com/gtkwave/gtkwave.git
 [submodule "third_party/exprtk"]
 	path = third_party/exprtk
-	url = https://github.com/ArashPartow/exprtk.git
+    url = https://github.com/ArashPartow/exprtk.git
+    branch = release
 [submodule "third_party/spdlog"]
 	path = third_party/spdlog
 	url = https://github.com/gabime/spdlog.git

diff --git a/src/DeviceModeling/rs_expression_evaluator.h b/src/DeviceModeling/rs_expression_evaluator.h
@@ -108,7 +108,7 @@ class rs_expression_evaluator {
     symbol_table_t symbol_table;
     expression_t expression;
     expression.register_symbol_table(symbol_table);
-    parser_t parser(settings_t(settings_t::compile_all_opts +
+    parser_t parser(settings_t(settings_t::default_compile_all_opts +
                                settings_t::e_disable_usr_on_rsrvd)
                         .disable_all_base_functions()
                         .disable_all_control_structures());
@@ -178,7 +178,7 @@ class rs_expression_evaluator {
     symbol_table_t symbol_table;
     expression_t expression;
     expression.register_symbol_table(symbol_table);
-    parser_t parser(settings_t(settings_t::compile_all_opts +
+    parser_t parser(settings_t(settings_t::default_compile_all_opts +
                                settings_t::e_disable_usr_on_rsrvd)
                         .disable_all_base_functions()
                         .disable_all_control_structures());

diff --git a/third_party/exprtk b/third_party/exprtk
+30 −0		.circleci/config.yml
+6 −5		Makefile
+9,292 −4,209		exprtk.hpp
+49 −44		exprtk_benchmark.cpp
+37,872 −37,872		exprtk_functional_ext_test.txt
+8,960 −7,056		exprtk_functional_test.txt
+4 −3		exprtk_simple_example_01.cpp
+13 −12		exprtk_simple_example_02.cpp
+4 −3		exprtk_simple_example_03.cpp
+27 −25		exprtk_simple_example_04.cpp
+6 −5		exprtk_simple_example_05.cpp
+7 −6		exprtk_simple_example_06.cpp
+3 −2		exprtk_simple_example_07.cpp
+15 −12		exprtk_simple_example_08.cpp
+104 −76		exprtk_simple_example_09.cpp
+31 −26		exprtk_simple_example_10.cpp
+10 −7		exprtk_simple_example_11.cpp
+20 −20		exprtk_simple_example_12.cpp
+26 −25		exprtk_simple_example_13.cpp
+11 −10		exprtk_simple_example_14.cpp
+31 −30		exprtk_simple_example_15.cpp
+17 −16		exprtk_simple_example_16.cpp
+4 −3		exprtk_simple_example_17.cpp
+27 −26		exprtk_simple_example_18.cpp
+27 −25		exprtk_simple_example_19.cpp
+109 −0		exprtk_simple_example_20.cpp
+117 −0		exprtk_simple_example_21.cpp
+144 −0		exprtk_simple_example_22.cpp
+136 −0		exprtk_simple_example_23.cpp
+143 −0		exprtk_simple_example_24.cpp
+7,516 −4,055		exprtk_test.cpp
+24 −0		license.txt
+1,798 −593		readme.txt