Changeset 2287 in Sophya

Timestamp:

Dec 5, 2002, 12:16:52 PM (23 years ago)

Author:

ansari

Message:

modifs cxxexecutor avec options declarevars + echo2file - Reza 5/12/02

Location:

trunk/SophyaPI/PIext

Files:

• cxxexecutor.cc (modified) (5 diffs)
• cxxexecutor.h (modified) (2 diffs)
• piacmd.cc (modified) (2 diffs)

trunk/SophyaPI/PIext/cxxexecutor.cc

@@ -15 +15 @@
   : mUserCodeFn(""), mUserFctFn("")
   , mCompOpt(""), mLinkOpt(""), mMyLibs("")
-  , mDefRoot("cxx_spiapp"), mDefFunc("usercxx"), mPrtLevel(2)
+  , mDefRoot("cxx_spiapp"), mDefFunc("usercxx"), mPrtLevel(2), mFgPutVar(false)
 {
 mIncList.resize(0);
@@ -121 +121 @@
 usage+= "       c++import -?? : list of available modules for executor\n";
 usage+= "Warning: to be used before c++create c++compile c++exec ...";
+mpiac->RegisterCommand(kw, usage, this, hgrp);
+
+kw = "c++declareomgvar";
+usage = "c++declareomgvar: Activate/Deactivate ObjectManager variables declaration \n";
+usage+= "Usage: c++declareomgvar [false/true] \n";
+usage+= "   if true, the ObjectManager variables are declared as $varname \n";
+usage+= "   no arguments: display the current status of the flag (default=false\n";
 mpiac->RegisterCommand(kw, usage, this, hgrp);
 
@@ -234 +241 @@
   }
   FillModuleImport(tokens);
-
+} else if(kw == "c++declareomgvar") {
+  if (tokens.size() <1) {
+    string fgstat = (mFgPutVar) ? "TRUE" : "FALSE" ; 
+    cout << " c++declareomgvar: Current flag status: " <<  fgstat << endl;
+  }
+  else {
+    if (tokens[0] == "true") DeclareObjMgrVar(true);
+    else  if (tokens[0] == "false") DeclareObjMgrVar(false);
+  }
 } else if(kw == "c++prtlevel") {
   if(tokens.size()==1) if(tokens[0]=="-?")
@@ -300 +315 @@
 os<<endl;
 
-PutVar(os);
+if (mFgPutVar) PutVar(os);
 os<<endl;
 
@@ -388 +403 @@
   <<"  om.DisplayObj(name, opt); \n"
   <<"} \n" << endl;
-
-os<<"//---- Objects and variables saving"<<endl
-  <<"#define KeepObj(obj) Keep_Object(obj, #obj);"<<endl
-  <<"#define KeepVar(var) ___nomobj = #var; omg.GetVarList().Get(___nomobj) = var ;"<<endl
+os<<"//---- function for getting and setting ObjectManager variables  " << endl;
+os<<"void Set_ObjMgrVar(MuTyV v, string const & nom) \n{ \n" 
+  <<"  NamedObjMgr om; \n"
+  <<"  om.SetVar(nom, (string)v); \n"
+  <<"} \n" << endl;
+os<<"MuTyV Get_ObjMgrVar(const char * nom) \n{ \n" 
+  <<"  string name = nom; NamedObjMgr om; \n"
+  <<"  MuTyV v = om.GetVar(name); \n"
+  <<"  return v; \n"
+  <<"} \n" << endl;
+
+os<<"//---- Macro for Objects and variables saving"<<endl
+  <<"#define KeepObj(obj) Keep_Object(obj, #obj)"<<endl
+  <<"#define GetOMVar(var) Get_ObjMgrVar( #var )"<<endl
+  <<"#define SetOMVar(var) Set_ObjMgrVar(var, #var )"<<endl
   <<endl;
 
-os<<"//---- Displaying objects and command execution"<<endl;
+os<<"//---- Macro Displaying objects and command execution"<<endl;
 os<<"#define DisplayObj(obj, att) Display_Object(obj, att, #obj); \n" << endl;
 os<<"#define ExecuteCommand(cmd) srvo.ExecuteCommand(cmd); \n" << endl;

trunk/SophyaPI/PIext/cxxexecutor.h

@@ -28 +28 @@
 
   int  ExecuteCXX(string usercode,string userfct="");
+
+  // if true , declare ObjMgr variables as $varname 
+  inline void DeclareObjMgrVar(bool fg=false) { mFgPutVar=fg; }
 
   int  CrFile(string cfilename="",string func="");
@@ -92 +95 @@
 
   uint_2 mPrtLevel;
+  bool   mFgPutVar;  // if true , declare ObjMgr variables as $varname, default=false
 };
 

trunk/SophyaPI/PIext/piacmd.cc

@@ -431 +431 @@
 usage += "  > rpneval varname RPNExpression # Reverse Polish Notation evaluation \n";
 usage += "  > echo string            # output string \n";
+usage += "  > echo2file filename string # Append the string to the specified file \n";
 usage += "  > alias name string      # define a command alias \n";
 usage += "  > readstdin varname      # reads a line from stdin into $varname \n";
@@ -1528 +1529 @@
   cout << endl;
  }
+else if (kw == "echo2file") {
+  if (tokens.size() < 1) {
+    cout << "PIACmd::Interpret() Usage: echo2file filename [string ] " << endl;  
+    return(0);
+  }
+  ofstream ofs(tokens[0].c_str(), ios::app);
+  for (int ii=1; ii<tokens.size(); ii++)
+    ofs << tokens[ii] << " " ;
+  ofs << endl;
+ }
 else if (kw == "readstdin") {
   if (tokens.size() < 1) { cout << "PIACmd::Interpret() Usage: readstdin varname" << endl;  return(0); }