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

Timestamp:

Apr 27, 2012, 12:34:31 AM (13 years ago)

Author:

ansari

Message:

Introduction de la classe interface CE_VarListInterface et modifs classe CExpressionEvaluator pour permettre l'inclusion de variables nommees dans les expressions traitees par CExpressionEvaluator, adaptation de la classe Commander afin que les variables de l'interpreteur soit visible par l'evaluateur CExpressionEvaluator, Reza 27/04/2012

File:

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

trunk/SophyaLib/SysTools/cexpre.cc

@@ -45 +45 @@
 class CE_NumberExp : public CExprBase {
 public:
-  CE_NumberExp(double v) { _val = v; }
+  CE_NumberExp(double v) { _val = v; _pval=&_val; }
+  CE_NumberExp(double* pv) { _pval=pv; _val = *_pval; }
   CE_NumberExp(string const & s);
   virtual ~CE_NumberExp() {}
-  virtual double Evaluate() const { return _val; }  
-  virtual void  Print(ostream& os) const { os << _val; }
+  virtual double Evaluate() const { return (*_pval); }  
+  virtual void  Print(ostream& os) const { os << (*_pval); }
 protected:
   double _val;
+  double* _pval; 
 };
 
 CE_NumberExp::CE_NumberExp(string const & s)
 {
+  _pval=&_val; 
   size_t l = s.length();
   if (l < 1) { 
@@ -64 +67 @@
   else if (s == "E") _val = M_E;
   else {
-    string errmsg = "CE_NumberExp::CE_NumberExp() Bad numerical constant: ";
+    string errmsg = "CE_NumberExp::CE_NumberExp() Bad numerical constant or unknown variable: ";
     errmsg += s;
     
@@ -349 +352 @@
 
 /*! 
-  Parse the string \c sex and builds an expression.
-  Can throw CExprException exception.
-*/
-CExpressionEvaluator::CExpressionEvaluator(string const & sex)
+  Parse the character string \c exp and builds an expression. Uses the given list of variables 
+  \c varlist if a valid pointer is provided. Can throw CExprException exception.
+*/
+CExpressionEvaluator::CExpressionEvaluator(const char* exp, CE_VarListInterface* varlist)
 {
   _exp = NULL;
+  _varlist = varlist;
+  size_t off=0,stop=0;
+  string fname = "";
+  string errmsg;
+  string sexp=exp;
+  _exp=  ParseString(0,fname,sexp,off,stop,errmsg);
+  if (_exp == NULL)  throw CExprException(errmsg);
+}
+
+/*! 
+  Parse the string \c sex and builds an expression. Uses the given list of variables 
+  \c varlist if a valid pointer is provided. Can throw CExprException exception.
+*/
+CExpressionEvaluator::CExpressionEvaluator(string const & sex, CE_VarListInterface* varlist)
+{
+  _exp = NULL;
+  _varlist = varlist;
   size_t off=0,stop=0;
   string fname = "";
@@ -402 +422 @@
 }
 
+CExprBase* CExpressionEvaluator::VarNameOrNumber(string const & s)
+{
+  if (_varlist==NULL)  return new CE_NumberExp(s); 
+  double* pv=_varlist->GetVarPointer(s);
+  if (pv!=NULL) return new CE_NumberExp(pv); 
+  return new CE_NumberExp(s); 
+}
 
 CExprBase* CExpressionEvaluator::ParseString(int extype, string fname, string const & sex, 
@@ -506 +533 @@
             errmsg = "CExpressionEvaluator::ParseString()/ Syntax Error - rx&&cx (B)"; 
           }
-          if (q > p) cx = new CE_NumberExp(sex.substr(p-osn,q-p+osn));
+          if (q > p) cx = VarNameOrNumber(sex.substr(p-osn,q-p+osn));
           else cx = rx;
           
@@ -551 +578 @@
             else {
               if (p == q)  cx = rx;
-              else cx = new CE_NumberExp(sex.substr(p-osn,q-p+osn));
+              else cx = VarNameOrNumber(sex.substr(p-osn,q-p+osn));
               rx = Arrange_CE_BinExpStack(sbx, cx, nbx);
               p = q+1;  osn = 0; lastopc = opc;
@@ -573 +600 @@
       }
       else { 
-        if (p<len)  cx = new CE_NumberExp(sex.substr(p-osn));
+        if (p<len)  cx = VarNameOrNumber(sex.substr(p-osn));
         else cx = rx;
         rx = Arrange_CE_BinExpStack(sbx, cx);