Changeset 2997 in Sophya for trunk/SophyaLib/SysTools

Timestamp:

Jul 2, 2006, 7:10:46 PM (19 years ago)

Author:

ansari

Message:

Mise en place priorite d'acces variables application AppVar() ds commander
si specifie sous forme ${varname} - Reza 2/7/2006

File:

• trunk/SophyaLib/SysTools/commander.cc (modified) (4 diffs)

trunk/SophyaLib/SysTools/commander.cc

@@ -1161 +1161 @@
 int iarr = -1;  // index d'element de tableau
 size_t p,q,q2,q3,l;
+bool fgvarapp = false;  //  Si true, VarApp en priorite 
 
 s2="";
@@ -1168 +1169 @@
 while (p < l) {
   iarr = -1;
+  fgvarapp = false; 
   q = s.find('$',p);
   if (q > l) break;
@@ -1198 +1200 @@
     vn = s.substr(q+2,q2-q-2);
     q2++;
+    fgvarapp = true;
   }
   else if ( s[q+1] == '(' ) {  // Variable in the form $(name)
@@ -1252 +1255 @@
     }
   }
-  if (iarr < 0) {
+  if (fgvarapp) {
+    if (!GetVarApp(vn, vv))
+      if (!Var2Str(vn, vv)) return(5);
+    s2 += (s.substr(p, q-p) + vv);
+    p = q2;    
+  }
+  else if (iarr < 0) {
     if (!Var2Str(vn, vv)) return(5);
     s2 += (s.substr(p, q-p) + vv);