Changeset 4063 in Sophya for trunk/SophyaLib/SysTools/commander.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/commander.cc (modified) (5 diffs)

trunk/SophyaLib/SysTools/commander.cc

@@ -442 +442 @@
 
 // ------------------------------------------------------------
+//         Classe Cmd_CE_VarList
+// ------------------------------------------------------------
+/*!
+  \internal
+  \class SOPHYA::Cmd_CE_VarList
+  \ingroup SysTools 
+  This class, reserved for internal use by class Commander, enables the CExpressionEvaluator class 
+  to access the interpreter variable values.
+*/
+
+class Cmd_CE_VarList : public CE_VarListInterface {
+public:
+  Cmd_CE_VarList(Commander& cmd) : cmd_(cmd) { } 
+  virtual void Update();
+  virtual double* GetVarPointer(std::string const& name);
+private:
+  Commander& cmd_;
+  std::map<std::string, double> namevals_;
+};
+
+/* --Methode-- */
+void Cmd_CE_VarList::Update()
+{
+  bool exist=false;
+  string sval;
+  std::map<std::string, double>::iterator it;
+  for(it=namevals_.begin(); it!=namevals_.end(); it++) {
+    exist=cmd_.GetVar((*it).first, sval);
+    if (!exist) throw NotFoundExc("Cmd_CE_VarList::Update() missing variable !");
+    (*it).second=atof(sval.c_str());
+  }
+  return;
+}
+
+/* --Methode-- */
+double* Cmd_CE_VarList::GetVarPointer(std::string const& name)
+{
+  std::map<std::string, double>::iterator it=namevals_.find(name);
+  if (it!=namevals_.end())  return &((*it).second);
+  bool exist=false;
+  string sval;
+  exist=cmd_.GetVar(name, sval);
+  if (!exist) return NULL;
+  namevals_[name]=atof(sval.c_str());
+  it=namevals_.find(name);
+  if (it!=namevals_.end())  return &((*it).second);
+  return NULL;
+}
+
+
+// ------------------------------------------------------------
 //         Classe Commander
 // ------------------------------------------------------------
@@ -492 +543 @@
 hist.open("history.pic");
 histon = true;
-trace = false;   timing = false;
+trace = false;   timing = false;   varcexp = true;
 gltimer = NULL;
 felevel_ = 0;
@@ -561 +612 @@
 usage += "  > sleep nsec  # sleep nsec seconds \n";   
 usage += "  > readstdin varname      # reads a line from stdin into $varname \n"; 
-usage += "  > timingon  timingoff traceon  traceoff \n";
+usage += "  > timingon  timingoff traceon  traceoff varcexpon varcexpoff \n";
 RegisterHelp(kw, usage, grp);
 
@@ -1085 +1136 @@
     try {
       double res = 0.;
-      if (tokens.size() > 2) {
-        string sex = tokens[1];
+      string sex=tokens[1];
+      if (tokens.size() > 2) 
         for(unsigned int js=2; js<tokens.size(); js++)  sex += tokens[js];
-        CExpressionEvaluator cex(sex);
+      if (varcexp) {  //--- Evaluation d'expression avec decodage de noms de variables  
+        Cmd_CE_VarList cevl(*this);
+        CExpressionEvaluator cex(sex,&cevl);
         res = cex.Value();
       }
-      else {
-        CExpressionEvaluator cex(tokens[1]);
+      else {  //--- Evaluation d'expression SANS decodage des noms de variables  
+        CExpressionEvaluator cex(sex);
         res = cex.Value();
       }
@@ -1957 +2010 @@
   if (gltimer)  delete gltimer;  gltimer = NULL;  timing = false; 
   }
+else if (kw == "varcexpon")  
+  { cout << "Commander::Interpret()  -> Activating variable name decoding in expression evaluation " << endl; varcexp = true; }
+else if (kw == "varcexpoff") 
+  { cout << "Commander::Interpret()  -> Deactivating variable name decoding in expression evaluation " << endl; varcexp = false; }
 else if (kw == "exec") {
   if (tokens.size() < 1) { cout << "Commander::Interpret() Usage: exec filename" << endl;  return(0); }