Changeset 2520 in Sophya for trunk/SophyaLib/SysTools/cexpre.cc

Timestamp:

Mar 19, 2004, 9:07:28 AM (22 years ago)

Author:

ansari

Message:

Correction bug traitement signe +/- en debut de nombre - Reza 19/03/2004

File:

• trunk/SophyaLib/SysTools/cexpre.cc (modified) (9 diffs)

trunk/SophyaLib/SysTools/cexpre.cc

@@ -311 +311 @@
   size_t p=0, q=0;
   char lastopc=0, opc=0; // Last/current operation sign (+,-,*,/,...)
+  int osn = 0;
   bool finok = false;
   bool fgcont = true;
@@ -344 +345 @@
               }
               else rx = cx;
-              p = stop+1; lastopc = opc; 
+              p = stop+1; osn = 0; lastopc = opc; 
             }
           }
@@ -363 +364 @@
             errmsg = "CExpressionEvaluator::ParseString()/ Syntax Error - rx&&cx (B)"; 
           }
-          if (q > p) cx = new CE_NumberExp(sex.substr(p,q-p));
+          if (q > p) cx = new CE_NumberExp(sex.substr(p-osn,q-p+osn));
           else cx = rx;
           
@@ -378 +379 @@
             if (opc == ')') { // Signe de fin de traitement d'une portion d'expression
               if (extype == 2) { rx = fx; fx = NULL; }
-              stop = q;  lastopc = opc;
+              stop = q;  osn = 0; lastopc = opc;
               fgcont = false;
               finok = true;
@@ -384 +385 @@
             else {
               if (q == (len-1)) finok = true;
-              p = q+1; lastopc = opc; 
+              p = q+1; osn = 0; lastopc = opc; 
             }
           }
@@ -393 +394 @@
         case '*' :
         case '/' :
-          // Traitement des signes +/- qui pourrait faire partie d'une constante numerique
-          if (!( ((opc=='+')||(opc=='-')) && ( (q==off) || ( (q==p) && (rx == NULL) ) ) ) ) {
-            //            ((lastopc=='+')||(lastopc=='-')||(lastopc=='*')||(lastopc=='/')) ) ) ) ) {
+          if (!( ((opc=='+')||(opc=='-')) && ( (q==off) || ( (q==p) && lastopc != '(') ) ) ) {
             CE_BinExp* nbx;
             if (opc == '+')  nbx = new CE_AddExp;  
@@ -402 +401 @@
             else  nbx =  new CE_DivExp;  
             if ((p == q) && (rx == NULL)) {
-              checkok = false; p = q;  fgcont = false; 
+              checkok = false; p = q;  osn = 0; fgcont = false; 
               delete nbx;
               errmsg = "CExpressionEvaluator::ParseString() Syntax Error - rx==NULL (C)";
@@ -408 +407 @@
             else {
               if (p == q)  cx = rx;
-              else cx = new CE_NumberExp(sex.substr(p,q-p));
+              else cx = new CE_NumberExp(sex.substr(p-osn,q-p+osn));
               rx = Arrange_CE_BinExpStack(sbx, cx, nbx);
-              p = q+1;  lastopc = opc;
-            }
+              p = q+1;  osn = 0; lastopc = opc;
+            }
+          }
+          else {
+          // Traitement des signes +/- qui pourrait faire partie d'une constante numerique
+            p = q+1;  osn++;
+            continue;
           }
           break;
@@ -425 +429 @@
       }
       else { 
-        if (p<len)  cx = new CE_NumberExp(sex.substr(p));
+        if (p<len)  cx = new CE_NumberExp(sex.substr(p-osn));
         else cx = rx;
         rx = Arrange_CE_BinExpStack(sbx, cx);