Fixes for ATMSP benchmark

Updates to ExprTk

Author: ArashPartow

exprtk/exprtk.hpp

@@ -33733,6 +33733,12 @@ namespace exprtk
          register_sf3(24) register_sf3(25) register_sf3(26) register_sf3(27)
          register_sf3(28) register_sf3(29) register_sf3(30)
          #undef register_sf3
+
+         #define register_sf3_extid(Id, Op)                                        \
+         sf3_map[Id] = pair_t(details::sf##Op##_op<T>::process,details::e_sf##Op); \
+
+         register_sf3_extid("(t-t)-t",23)  // (t-t)-t --> t-(t+t)
+         #undef register_sf3_extid
       }
 
       inline void load_sf4_map(sf4_map_t& sf4_map)

exprtk/readme.txt

@@ -1325,7 +1325,7 @@ follows:
    var y := x + 2;  // Statement 2
    y := x + 3y;     // Statement 3
    x - y;           // Statement 4
-8
+
 
 (3) Conditional Statements (If-Then-Else)
 ExprTk support two forms  of conditional branching or  otherwise known

src/BenchATMSP.cpp

@@ -1,6 +1,5 @@
 #include "BenchATMSP.h"
 
-//#include <windows.h>
 #include <cmath>
 
 // atmsp
@@ -104,17 +103,17 @@ double BenchATMSP::DoBenchmark(const std::string& sExpr, long iCount)
             ATMSB<double> test_bc;
             ATMSP<double> test_p;
 
-            bc.var[0] = 1.1;
-            bc.var[1] = 2.2;
-            bc.var[2] = 3.3;
-            bc.var[3] = 2.123456;
-            bc.var[4] = 3.123456;
-            bc.var[5] = 4.123456;
-            bc.var[6] = 5.123456;
+            test_bc.var[0] = 1.1;
+            test_bc.var[1] = 2.2;
+            test_bc.var[2] = 3.3;
+            test_bc.var[3] = 2.123456;
+            test_bc.var[4] = 3.123456;
+            test_bc.var[5] = 4.123456;
+            test_bc.var[6] = 5.123456;
 
             if (
-                 test_p.parse(test_bc, test.first, "a, b, c, x, y, z, w") ||
-                 (!is_equal(test.second, bc.run()))
+                 (0 != test_p.parse(test_bc, test.first, "a, b, c, x, y, z, w")) ||
+                 (!is_equal(test.second, test_bc.run()))
                )
             {
                test_result = false;