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

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.h (modified) (6 diffs)

trunk/SophyaLib/SysTools/cexpre.h

@@ -9 +9 @@
 #include <iostream>
 #include <string>
+#include <vector>
+#include <map>
 #include "pexceptions.h"
 
@@ -46 +48 @@
 };
 
+
 /*! 
   \ingroup SysTools
@@ -53 +56 @@
   {  ex.Print(s);  return(s);  }
 
+/*! 
+  \ingroup SysTools
+  \brief Interface class used by the CExpressionEvaluator class to represent a list of variables
+  or named values accessible trough a pointer.
+
+  Inherited class should define the \b GetVarPointer() method, and can optionaly redefine 
+  the \b Update() method. 
+  \sa CExpressionEvaluator
+*/
+class CE_VarListInterface {
+public:
+  //! To be called to update values corresponding to the pointers. Default implementation does nothing.
+  virtual void Update() { return; } 
+  //! Return a pointer to a double containing the value associated with \t name.  
+  virtual double* GetVarPointer(std::string const& name) = 0;
+};
+
+
 class CE_BinExp;
 class CE_FuncExp;
@@ -58 +79 @@
 class CExpressionEvaluator : public CExprBase {
 public:
-  CExpressionEvaluator(string const & sex);
+  CExpressionEvaluator(const char* sexp, CE_VarListInterface* pvlist=NULL);
+  CExpressionEvaluator(string const & sex, CE_VarListInterface* pvlist=NULL);
+
   virtual ~CExpressionEvaluator();
 //! Evaluate the expression and returns the corresponding value.
@@ -68 +91 @@
 
 protected:
+//! Parse variable names or constants and return CE_NumberExp object.
+  CExprBase* VarNameOrNumber(string const & s); 
 //! Does the parsing and builds an CExprBase object.
   CExprBase* ParseString(int extype, string fname, string const & sex, 
@@ -73 +98 @@
 
   CExprBase * _exp;
+  CE_VarListInterface* _varlist; 
 };