Changeset 1276 in Sophya for trunk/SophyaPI/PIext/piacmd.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/piacmd.cc (modified) (20 diffs)

trunk/SophyaPI/PIext/piacmd.cc

@@ -169 +169 @@
   for(int kk=1; kk<args.size(); kk++) strlist.push_back(args[kk]);
   typ = BT_ForeachList;
+  blkok = true;
   }
 else { // This is an integer or float loop
@@ -189 +190 @@
   if (fl) { 
     typ = BT_ForeachFloat;
+    blkok = true;
     f1 = atof(a1.c_str());
     f2 = atof(a2.c_str());
@@ -196 +198 @@
   else { 
     typ = BT_ForeachInt;
+    blkok = true;
     i1 = atoi(a1.c_str());
     i2 = atoi(a2.c_str());
@@ -285 +288 @@
 bloccxx = false;
 bloctest = false;
+mulinecmd = "";
+mulinefg = false;
 
 cmdhgrp["All"] = 0;
@@ -490 +495 @@
 if (s[0] == '#') return(0); // si c'est un commentaire
 
+// Logique de gestion des lignes suite
+// un \ en derniere position indique la presence d'une ligne suite
+if (s[l-1] == '\\' ) { // Lignes suite ...
+  mulinefg = true;
+  mulinecmd += s.substr(0,l-1);
+  mImgApp->GetConsole()->SetPrompt("...? ");
+  return(0);
+}
+
+if (mulinefg) {  // Il y avait des lignes suite
+  s = mulinecmd + s;
+  mulinecmd = "";
+  mulinefg = false;
+  const char * rprompt = (curblk == NULL) ? "Cmd> " : "foreach? ";
+  mImgApp->GetConsole()->SetPrompt(rprompt);
+}
 
 // Removing leading blanks
-size_t p,q,q2;
-l = s.length();
-if (l < 1)  return(0);
+size_t p,q;
 
 p=s.find_first_not_of(" \t");
@@ -534 +553 @@
        }
     else  {
-      char prompt[64];
-      sprintf(prompt, "foreach-%d? ", felevel);
-      mImgApp->GetConsole()->SetPrompt(prompt);
+      //      char prompt[64];
+      //      sprintf(prompt, "foreach-%d? ", felevel);
+      mImgApp->GetConsole()->SetPrompt("foreach? ");
       }
     return(0);
@@ -544 +563 @@
 
 // Nous ne sommes donc pas dans un bloc ....  Substitution de variables
-
+string s2;
+int rcs ;
 // Execution de code C++
 
@@ -553 +573 @@
     return(99);
   }
-  if (s[1] == '@') { // Sans substitution des variables $
-    return(cxxe->ExecuteCXX(s.substr(2)));
-  } else { // Avec substitution de variables $
-    string s2;
-    SubstituteVars(s, s2);
+  // Sans substitution des variables $
+  if (s[1] == '@') return(cxxe->ExecuteCXX(s.substr(2)));
+  else { // AVEC substitution des variables $
+    rcs = SubstituteVars(s, s2);
+    if (rcs) return(rcs);
     return(cxxe->ExecuteCXX(s2.substr(1)));    
   }
@@ -563 +583 @@
 
 
-string s2;
-SubstituteVars(s, s2);
+rcs = SubstituteVars(s, s2);
+if (rcs) return(rcs);
 
 // >>>> Separating keyword and tokens 
@@ -579 +599 @@
   p = toks.find_first_not_of(" \t",q+1); // au debut d'un token
   if (p>=l) break;
-  q = toks.find_first_of(" \t",p); // la fin du token;
+  if ( (toks[p] == '\'') || (toks[p] == '"') ) {
+    q = toks.find(toks[p],p+1);
+    if (q>=l)  { 
+      cerr << "Syntax Error - Unbalenced quotes " << toks[p] << '.' << endl;
+      return(2);
+    }
+    p++;
+  }
+  else {
+    q = toks.find_first_of(" \t",p); // la fin du token;
+  }
   string token = toks.substr(p,q-p);
   tokens.push_back(token);
@@ -629 +659 @@
 while (p < l) {
   q = s.find('$',p);
+  if (q > l) break;
+  q2 = s.find('\'',p);
+  if ((q2 < l) && (q2 < q)) {  // On saute la chaine delimitee par ' '
+    q2 = s.find('\'',q2+1);
+    if (q2 >= l) {
+      cerr << " Syntax error - Unbalenced  quotes !!! " << endl;
+      return(1);
+      }
+    s2 += s.substr(p, q2-p+1);
+    p = q2+1;  continue;  
+  }
   //  cout << "DBG: " << s2 << " p= " << p << " q= " << q << " L= " << l << endl;
-  if (q > l) break;
   if ((q>0) && (s[q-1] == '\\')) {   // Escape character \$
      s2 += (s.substr(p,q-1-p) + '$') ; p = q+1;
@@ -636 +676 @@
      }
   if (q >= l-1) {
-      cerr << " Syntax error !!! " << endl;
-      return(0);
+      cerr << " Syntax error - line ending with $ !!! " << endl;
+      return(2);
       }
   vn = "";
@@ -643 +683 @@
     q2 = s.find('}',q+1);
     if (q2 >= l) {
-      cerr << " Syntax error !!! " << endl;
-      return(0);
+      cerr << " Syntax error -  Unbalenced  brace {} !!! " << endl;
+      return(3);
       }
     vn = s.substr(q+2,q2-q-2);
@@ -652 +692 @@
     q2 = s.find(']',q+1);
     if (q2 >= l) {
-      cerr << " Syntax error !!! " << endl;
-      return(0);
+      cerr << " Syntax error - Unbalenced  brace [] !!! " << endl;
+      return(4);
       }
     vn = s.substr(q+2,q2-q-2);
     if ( (vn.length() < 1) || (!omg.HasVar(vn)) )  {
       cerr << " Error: Undefined variable " << vn << " ! " << endl;
-      return(0);
+      return(5);
       }
     vn = omg.GetVar(vn);
@@ -664 +704 @@
     }
   else { 
-    q2 = s.find_first_of(" .:/,]()$",q+1); 
+    q2 = s.find_first_of(" .:/,]()$\"'",q+1); 
     if (q2 > l) q2 = l;
     vn = s.substr(q+1, q2-q-1); 
@@ -670 +710 @@
   if ( (vn.length() < 1) || (!omg.HasVar(vn)) )  {
     cerr << " Error: Undefined variable " << vn << " ! " << endl;
-    return(0);
+    return(5);
     }
   s2 += (s.substr(p, q-p) + omg.GetVar(vn));
@@ -705 +745 @@
     return(0);
     }
-  string xx = tokens[1];
-  for (int kk=2; kk<tokens.size(); kk++)  xx += (' ' + tokens[kk] );
-  omg.SetVar(tokens[0], xx);
+  //  string xx = tokens[1];
+  //  for (int kk=2; kk<tokens.size(); kk++)  xx += (' ' + tokens[kk] );
+  omg.SetVar(tokens[0], tokens[1]);
   }
 
@@ -756 +796 @@
   }
 else if (kw == "echo") {
-  for (int kk=0; kk<tokens.size(); kk++)  cout << tokens[kk] << " " ;
+  for (int ii=0; ii<tokens.size(); ii++)
+    cout << tokens[ii] << " " ;
   cout << endl;
-  }
-
+ }
 else if (kw == "readstdin") {
   if (tokens.size() < 1) { cout << "PIACmd::Interpret() Usage: readstdin varname" << endl;  return(0); }
@@ -816 +856 @@
 else if (kw == "shell") {
   if (tokens.size() < 1) { cout << "PIACmd::Interpret() Usage: shell cmdline" << endl;  return(0); }
-  system(toks.c_str());
-  }
+  string cmd;
+  for (int ii=0; ii<tokens.size(); ii++)
+    cmd += (tokens[ii] + ' ');
+  system(cmd.c_str());
+  }
+
 //  Execution d'une commande enregistree
-// CMV c'est ici qu'il faut passer la string
 else rc = ExecuteCommand(kw, tokens, toks);
 
@@ -894 +937 @@
 // Setting $0 ... $99 variables 
 int k;
-CmdVarList::iterator it;
 char buff[32];
 // First, we clear all previous values