Changeset 2550 in Sophya

Timestamp:

Jun 8, 2004, 1:46:25 AM (21 years ago)

Author:

ansari

Message:

Correction bug ds CExprEvaluator (gestion Chs - ) - Reza 8 Juin 2004

File:

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

trunk/SophyaLib/SysTools/cexpre.cc

@@ -65 +65 @@
 }
 
+//---------------------------------------------------------
+//-----------  Expression changement de signe -------------
+class CE_ChsExp : public CExprBase {
+public:
+  explicit CE_ChsExp(CExprBase * e) { _e = e; } 
+  virtual  ~CE_ChsExp() { if (_e) delete _e; } 
+  virtual double Evaluate() const { return -_e->Evaluate(); }  
+  virtual bool   CheckE(string& errmsg) const { if (_e) return true; else return false; }
+  virtual void  Print(ostream& os) const { os << "-( "; _e->Print(os); os << " )"; }
+ protected:
+  CExprBase * _e;
+};
 
 //---------------------------------------------------------
@@ -334 +346 @@
           if (!cx)  { checkok = false; p = stop+1; }
           else { 
-            if (rx) { 
+            if (osn == 1) {
+              if (sex[p-osn] == '-')  cx = new CE_ChsExp(cx);
+            }
+            if (osn > 1) {
+              checkok = false; p = stop+1; fgcont = false; 
+              delete cx;
+              errmsg = "CExpressionEvaluator::ParseString()/ Syntax Error - multiple chs (+/-) (AA)"; 
+            }
+            else if (rx) { 
               checkok = false; p = stop+1; fgcont = false; 
               delete cx;