Changeset 2965

Timestamp:

2002-02-13T11:46:47+13:00 (22 years ago)

Author:

jrm21

Message:

Allow nested _If_ macros. We now count '(' and ')' characters, so you can now
do _If_(_foo_, _If_(_bar_,FOOBAR,FOONOBAR), _If_(_bar_,NOFOOBAR,NOFOONOBAR) )
inside a macro file. If you want to display a bracket, you can escape it.
Previously we had assumed that a ',' marked the end of a toplevel argument.

File:

• trunk/gsdl/lib/display.cpp (modified) (13 diffs)

trunk/gsdl/lib/display.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.25  2002/02/12 22:46:47  jrm21
+   Allow nested _If_ macros. We now count '(' and ')' characters, so you can now
+   do _If_(_foo_, _If_(_bar_,FOOBAR,FOONOBAR), _If_(_bar_,NOFOOBAR,NOFOONOBAR) )
+   inside a macro file. If you want to display a bracket, you can escape it.
+   Previously we had assumed that a ',' marked the end of a toplevel argument.
+
    Revision 1.24  2001/01/25 18:26:44  cs025
    Included CORBA branch for first time
@@ -1069 +1075 @@
   text_t::const_iterator ttend = inputtext.end();
   unsigned short c = '\0';
+  int openbrackets=0;
 
   if (package.empty()) package = "Global";
 
   outputtext.clear();
-      
   // use one-character lookahead
   if (tthere != ttend) c = (*tthere);
@@ -1138 +1144 @@
         {
           // found a macro!!!! (maybe)
-    
           c = my_ttnextchar (tthere, ttend); // skip the '_'
     
@@ -1145 +1150 @@
         {
           c = my_ttnextchar (tthere, ttend); // skip '('
-      
+          openbrackets++;
           // have to be careful of quotes
           unsigned short quote = '\0';
@@ -1161 +1166 @@
             {
               // not in a quote at the moment
-              if (c == ')') 
+              if (c == '(')
                 {
-                  // found end of the arguments
-                  c = my_ttnextchar (tthere, ttend); // skip ')'
-                  break;
-        
+                  openbrackets++;
+////                  macroargs.push_back (c);
+////                  c = my_ttnextchar (tthere, ttend); 
+                }
+              else if (c == ')') 
+                {
+                  openbrackets--;
+                  if (openbrackets==0) {
+                // found end of the arguments
+                c = my_ttnextchar (tthere, ttend); // skip ')'
+                break;
+                  } else {
+                // nested brackets
+                    macroargs.push_back (c);
+                    c = my_ttnextchar (tthere, ttend); 
+                  }
                 } 
               else if (c == '\'' || c == '\"') 
@@ -1184 +1201 @@
               if (tthere != ttend) macroargs.push_back (c);
               c = my_ttnextchar (tthere, ttend);
-            }
+            } // while (tthere != ttend)
         }
     
@@ -1225 +1242 @@
       c = my_ttnextchar (tthere, ttend);
     }
-    }
+    } // end of while (tthere != ttend)
 }
 
@@ -1397 +1414 @@
 
   //  cerr << "r: " << recursiondepth << "\n";
-
   // check for deep recursion
   if (recursiondepth >= MAXRECURSIONDEPTH)
@@ -1415 +1431 @@
     endit = macroparam.end();
     if (hereit != endit) c = (*hereit);
-
+    int openbrackets=0; // keep track of bracket level eg _If_(1, _macro_(arg))
+            // this allows commas inside brackets (as arguments)
     while (hereit != endit) {
       // get the next parameter
@@ -1435 +1452 @@
       // found a quoted section
       quote = c;
-      //      aparam.push_back(c);
+      if (openbrackets>0) aparam.push_back(c);
 
     } else if (quote!='\0' && c==quote) {
       // found the end of a quote
       quote = '\0';
-      //      aparam.push_back(c);
-
-    } else if (quote=='\0' && c==',') {
+      if (openbrackets<0) aparam.push_back(c);
+
+    } else if (quote=='\0' && (c==',' || c==')') && openbrackets==0) {
       // found the end of a parameter
       c = my_ttnextchar (hereit, endit);
       break;
 
+    } else if (c=='(') {
+      aparam.push_back(c);
+      openbrackets++;
+    } else if (c==')') {
+      openbrackets--;
+      aparam.push_back(c);
     } else {
       // ordinary character
@@ -1454 +1477 @@
     c = my_ttnextchar (hereit, endit);
       }
+
 
       // add this parameter to the list
@@ -1478 +1502 @@
     // will always output something
     outputtext.clear();
-    
+
+
     // expand out the first parameter
     if (paramcond != paramend) {
-      text_t tmpoutput;
-      expandstring (macropackage, *paramcond, tmpoutput, recursiondepth+1);
-      lc (tmpoutput);
-      
+      /// text_t tmpoutput;
+      /// expandstring (macropackage, *paramcond, tmpoutput, recursiondepth+1);
+      /// lc (tmpoutput);
       // test the expanded string
       if (boolexpr (macropackage, *paramcond, recursiondepth+1)) {
@@ -1491 +1515 @@
     if (paramthen != paramend)
       expandstring (macropackage, *paramthen, outputtext, recursiondepth+1);
-
       } else {
     // false