Changeset 2512 in Sophya for trunk/SophyaLib/SysTools/rpneval.cc

Timestamp:

Mar 16, 2004, 12:49:33 AM (22 years ago)

Author:

ansari

Message:

Correction bugs ds CExpression/RPNExpression et adaptation classe Commander avec utilisation classe CExpressionEvaluator - Reza 16 Mars 2004

File:

• trunk/SophyaLib/SysTools/rpneval.cc (modified) (7 diffs)

trunk/SophyaLib/SysTools/rpneval.cc

@@ -22 +22 @@
   FillVStringFrString(sex, exe, ' ');
   int rc = EvalRPNExpr(exe, 0);
-  if (rc != 0) throw RPNExprException("RPNExpressionEvaluator() - syntax error");  
+  if (rc < exe.size()) { 
+    string msg = "RPNExpressionEvaluator() - syntax error near ";
+    msg += exe[rc];
+    char buff[32];
+    sprintf(buff," (word %d)",rc);
+    msg += buff;
+    throw RPNExprException(msg);
+  }
 }
 
@@ -28 +35 @@
 {
   int rc = EvalRPNExpr(exe, off);
-  if (rc != 0) throw RPNExprException("RPNExpressionEvaluator() - syntax error");
+  if (rc < exe.size()) { 
+    string msg = "RPNExpressionEvaluator() - syntax error near ";
+    msg += exe[rc];
+    char buff[32];
+    sprintf(buff," (word %d)",rc);
+    msg += buff;
+    throw RPNExprException(msg);
+  }
 }
 
@@ -49 +63 @@
 {
   
-  if (args.size() <= off)  return 0;
+  if (args.size() <= off)  return 1;
   double x,y;
   x = y = 0.;
-  stack<double> rpnstack_;  // Stack des operations en RPN 
+
   for(int k=off; k<args.size(); k++) {
     // Les 4 operations de base + - * / 
     if (args[k] == "+") { 
-      if ( CheckStack( x, y) ) return(1);
+      if ( CheckStack( x, y) ) return k;
       rpnstack_.top() = y+x;
     }
     else if (args[k] == "-") { 
-      if ( CheckStack( x, y) ) return(1);
+      if ( CheckStack( x, y) ) return k;
       rpnstack_.top() = y-x;
     }
     else if (args[k] == "*") { 
-      if ( CheckStack( x, y) ) return(1);
+      if ( CheckStack( x, y) ) return k;
       rpnstack_.top() = y*x;
     }
     else if (args[k] == "/") { 
-      if ( CheckStack( x, y) ) return(1);
+      if ( CheckStack( x, y) ) return k;
       rpnstack_.top() = y/x;
     }
     else if (args[k] == "%") { 
-      if ( CheckStack( x, y) ) return(1);
+      if ( CheckStack( x, y) ) return k;
       rpnstack_.top() = (int)y % (int)x;
     }
@@ -84 +98 @@
     // Les fonctions usuelles a 1 argument f(x)
     else if (args[k] == "cos") {
-      if ( CheckStack( x) ) return(1);
+      if ( CheckStack( x) ) return k;
       rpnstack_.top() = cos(x);
     }
     else if (args[k] == "sin") {
-      if ( CheckStack( x) ) return(1);
+      if ( CheckStack( x) ) return k;
       rpnstack_.top() = sin(x);
     }
     else if (args[k] == "tan") {
-      if ( CheckStack( x) ) return(1);
+      if ( CheckStack( x) ) return k;
       rpnstack_.top() = tan(x);
     }
     else if (args[k] == "acos") {
-      if ( CheckStack( x) ) return(1);
+      if ( CheckStack( x) ) return k;
       rpnstack_.top() = acos(x);
     }
     else if (args[k] == "asin") {
-      if ( CheckStack( x) ) return(1);
+      if ( CheckStack( x) ) return k;
       rpnstack_.top() = asin(x);
     }
     else if (args[k] == "atan") {
-      if ( CheckStack( x) ) return(1);
+      if ( CheckStack( x) ) return k;
       rpnstack_.top() = atan(x);
     }
     else if (args[k] == "chs") {
-      if ( CheckStack( x) ) return(1);
+      if ( CheckStack( x) ) return k;
       rpnstack_.top() = -x;
     }
     else if (args[k] == "sqrt") {
-      if ( CheckStack( x) ) return(1);
+      if ( CheckStack( x) ) return k;
       rpnstack_.top() = sqrt(x);
     }
     else if (args[k] == "sq") {  // x^2 
-      if ( CheckStack( x) ) return(1);
+      if ( CheckStack( x) ) return k;
       rpnstack_.top() = x*x;
     }
     else if (args[k] == "log") {
-      if ( CheckStack( x) ) return(1);
+      if ( CheckStack( x) ) return k;
       rpnstack_.top() = log(x);
     }
     else if (args[k] == "log10") {
-      if ( CheckStack( x) ) return(1);
+      if ( CheckStack( x) ) return k;
       rpnstack_.top() = log10(x);
     }
     else if (args[k] == "exp") {
-      if ( CheckStack( x) ) return(1);
+      if ( CheckStack( x) ) return k;
       rpnstack_.top() = exp(x);
     }
     else if (args[k] == "fabs") {
-      if ( CheckStack( x) ) return(1);
+      if ( CheckStack( x) ) return k;
       rpnstack_.top() = fabs(x);
     }
     else if (args[k] == "floor") {
-      if ( CheckStack( x) ) return(1);
+      if ( CheckStack( x) ) return k;
       rpnstack_.top() = floor(x);
     }
     else if (args[k] == "ceil") {
-      if ( CheckStack( x) ) return(1);
+      if ( CheckStack( x) ) return k;
       rpnstack_.top() = ceil(x);
     }
     // trunc et nint vire - ca ne compile pas sous linux - Reza 01/2003
     else if (args[k] == "deg2rad") {
-      if ( CheckStack( x) ) return(1);
+      if ( CheckStack( x) ) return k;
       rpnstack_.top() = x*M_PI/180.;
     }
     else if (args[k] == "rad2deg") {
-      if ( CheckStack( x) ) return(1);
+      if ( CheckStack( x) ) return k;
       rpnstack_.top() = x*180./M_PI;
     }
     // Les fonctions usuelles a 2 argument f(x,y)
     else if (args[k] == "pow") { 
-      if ( CheckStack( x, y) ) return(1);
+      if ( CheckStack( x, y) ) return k;
       rpnstack_.top() = pow(y,x);
     }
     else if (args[k] == "atan2") { 
-      if ( CheckStack( x, y) ) return(1);
+      if ( CheckStack( x, y) ) return k;
       rpnstack_.top() = atan2(x,y);
     }
@@ -188 +202 @@
       double px;
       int nn = ProductStack( px);
-      if (nn == 0) return(1);
+      if (nn == 0) return k;
       rpnstack_.push(px);
     }
@@ -196 +210 @@
     }
     else if (args[k] == "x<>y") {
-      if ( CheckStack( x, y) ) return(1);
+      if ( CheckStack( x, y) ) return k;
       rpnstack_.top() = x;  rpnstack_.push(y);
     }
@@ -211 +225 @@
       x = strtod(args[k].c_str(), &esptr);
       //      if (ctof(args[k].c_str(),&x) < 0) {
-      if (esptr == args[k].c_str()) return 2; 
+      if (esptr == args[k].c_str()) return k; 
       rpnstack_.push(x);
     }
 
   }
-  return(0);
+  return(args.size()+1);
 }