Changeset 1276 in Sophya for trunk/SophyaPI/PIext/basexecut.cc

Timestamp:

Nov 2, 2000, 11:18:50 AM (25 years ago)

Author:

ercodmgr

Message:

Amelioration de la syntaxe de l'interpreteur, gestion de quotes, ligne suite
Commande linkff2 (2eme groupe de link, pour utilisation par CxxExecutor
Amelioration de la gestion de TMPDIR

Reza 2/11/2000

File:

• trunk/SophyaPI/PIext/basexecut.cc (modified) (7 diffs)

trunk/SophyaPI/PIext/basexecut.cc

@@ -34 +34 @@
 mImgApp = app;
 dynlink = NULL;
+dynlink2 = NULL;
 RegisterCommands();
 }
@@ -39 +40 @@
 PIABaseExecutor::~PIABaseExecutor()
 {
+  if (dynlink) delete dynlink;
+  if (dynlink2) delete dynlink2;
 }
 
@@ -124 +127 @@
   if (rc == 0)  cout << "PIABaseExecutor: Link from " << tokens[0] << " OK " << endl;
 }
+else if (kw == "linkff2" ) {
+  if (tokens.size() < 2) { cout << "Usage: linkff2 fnameso f1 [f2 f3]" << endl;  return(0); }
+  string sph = "";
+  for(int gg=0; gg<5; gg++)   tokens.push_back(sph);
+  int rc = LinkUserFuncs2(tokens[0], tokens[1], tokens[2], tokens[3]);
+  if (rc == 0)  cout << "PIABaseExecutor: Link2 from " << tokens[0] << " OK " << endl;
+}
 else if (kw == "call" ) {
   if (tokens.size() < 1) { cout << "Usage: call userf [arg1 arg2 ...]" << endl;  return(0); }
-  UsFmap::iterator it = usfmap.find(tokens[0]);
-  if (it == usfmap.end()) {
+  UsFmap::iterator it;
+  UsFmap::iterator it1 = usfmap.find(tokens[0]);
+  UsFmap::iterator it2 = usfmap2.find(tokens[0]);
+  if ((it1 == usfmap.end()) && (it2 == usfmap2.end()) ) {
     cerr << "PIABaseExecutor: No User Function " << tokens[0] << endl;
     return(0);
   }
+  if (it1 == usfmap.end())  it = it2;
+  else it = it1;
   cout << "PIABaseExecutor: Call " << tokens[0] << "( ... )" << endl;
 // on est oblige de faire un cast  etant donne qu'on 
@@ -138 +152 @@
   bool red = mImgApp->HasRedirectedStdOutErr();
   mImgApp->RedirectStdOutErr(false);
+#ifdef SANS_EVOLPLANCK
   TRY {
     tokens.erase(tokens.begin());
@@ -143 +158 @@
   }  CATCH(merr) {
     fflush(stdout); 
+    string es = PeidaExc(merr);
+    cerr << "\n PIABaseExecutor: Call UserFunc  Exception :" << merr << es;
     cout << endl; 
-    cerr << endl;
-//CMV_A_FAIRE    string es = PeidaExc(merr);
-//CMV_A_FAIRE    cerr << "PIABaseExecutor: Call UserFunc  Exception :" << merr << es;
-    }
+    }
+#else
+  try {
+    tokens.erase(tokens.begin());
+    fuf(tokens);
+  }
+  catch ( PThrowable & exc ) {
+    cerr << "\n PIABaseExecutor: Call / Catched Exception :" 
+         << (string)typeid(exc).name() << " Msg= " 
+         << exc.Msg() << endl;
+    cout << endl; 
+  }
+  catch ( ... ) {
+    cerr << "\n PIABaseExecutor: Call / Catched Exception ... " 
+         << endl;
+    cout << endl; 
+  }
+#endif
   mImgApp->RedirectStdOutErr(red);
 }
@@ -677 +708 @@
 usage = "Dynamic linking of compiled user functions \n  Usage: link fnameso f1 [f2 f3]";
 usage += "\n  fnameso: Shared-object file name, f1,f2,f3 : User function names ";
-usage += "\n  Related commands: call loadmodule";  
+usage += "\n  Related commands: call loadmodule linkff2";  
+mpiac->RegisterCommand(kw, usage, this, "External Modules");
+kw = "linkff2";
+usage = "Dynamic linking of compiled user functions (Set 2)\n  Usage: linkff2 fnameso f1 [f2 f3]";
+usage += "\n  fnameso: Shared-object file name, f1,f2,f3 : User function names ";
+usage += "\n  Related commands: call link loadmodule";  
 mpiac->RegisterCommand(kw, usage, this, "External Modules");
 kw = "call";
@@ -1098 +1134 @@
 }
 
+/* --Methode-- */
+int PIABaseExecutor::LinkUserFuncs2(string& fnameso, string& func1, string& func2, string& func3)
+{
+string cmd;
+
+if (dynlink2) delete dynlink2;    dynlink2 = NULL;
+usfmap2.clear();
+
+dynlink2 = new PDynLinkMgr(fnameso, true);
+if (dynlink2 == NULL) { 
+  string sn = fnameso; 
+  cerr << "PIABaseExecutor/LinkUserFuncs2_Erreur: Erreur ouverture SO " << sn << endl; 
+  return(2); 
+  }
+
+int nok=0;
+// on utilise donc des DlFunction  (Reza 20/08/98)  voir commentaire ds .h (pb g++)
+// DlUserProcFunction f = NULL;
+DlFunction f = NULL;
+if ((func1.length() < 1) || (func1 == "-") || (func1 == ".") )  goto fin;
+f = dynlink2->GetFunction(func1);
+if (f) { nok++;  usfmap2[func1] = f; }
+else cerr << "PIABaseExecutor/LinkUserFuncs2_Erreur: Erreur linking " << func1 << endl;
+
+if ((func2.length() < 1) || (func2 == "-") || (func2 == ".") )  goto fin;
+f = dynlink2->GetFunction(func2);
+if (f) { nok++;  usfmap2[func2] = f; }
+else cerr << "PIABaseExecutor/LinkUserFuncs2_Erreur: Erreur linking " << func2 << endl;
+
+if ((func3.length() < 1) || (func3 == "-") || (func3 == ".") )  goto fin;
+f = dynlink2->GetFunction(func3);
+if (f) { nok++;  usfmap2[func3] = f; }
+else cerr << "PIABaseExecutor/LinkUserFuncs2_Erreur: Erreur linking " << func3 << endl;
+
+fin:
+if (nok < 1) { if (dynlink2) delete dynlink2;    dynlink2 = NULL;  return(3); }
+else return(0);
+}
+
 /* Nouvelle-Fonction */
 void RegisterPIGraphicsHelp(PIACmd* piac)