Changeset 628

Timestamp:

1999-09-24T14:25:35+12:00 (25 years ago)

Author:

rjmcnab

Message:

removed limitation on the number of arguments that a macro can have

File:

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

trunk/gsdl/lib/display.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.15  1999/09/24 02:25:35  rjmcnab
+   removed limitation on the number of arguments that a macro can have
+
    Revision 1.14  1999/09/07 04:57:41  sjboddie
    added gpl notice
@@ -1561 +1564 @@
         {
           text_t::const_iterator savedhereit = hereit;
-          unsigned short c2 = my_ttnextchar (hereit, endit);
-          unsigned short c3 = my_ttnextchar (hereit, endit);
-          if ((c2 >= '1') && (c2 <= '9') && (c3 == '_'))
-        {
-          // found an option macro, append the appropriate text
-          text_tlist::iterator ttlisthere = splitmacroparam.begin();
-          text_tlist::iterator ttlistend = splitmacroparam.end();
-          while ((c2 > '1') && (ttlisthere != ttlistend))
-            {
-              c2--;
-              ttlisthere++;
-            }
-          if (ttlisthere != ttlistend) {
-            tempmacrovalue.append(*ttlisthere);
-            if (findchar((*ttlisthere).begin(), (*ttlisthere).end(), '_') != (*ttlisthere).end())
-              needsexpansion = true;
-          }
-
-          c = my_ttnextchar (hereit, endit);
-
+
+          // attempt to get a number
+          int argnum = 0;
+          unsigned short digc = my_ttnextchar (hereit, endit);
+          while (digc >= '0' && digc <= '9') {
+        argnum = argnum*10 + digc - '0';
+        digc = my_ttnextchar (hereit, endit);
+          }
+          if (digc == '_' && argnum > 0) {
+        // found an option macro, append the appropriate text
+        text_tlist::iterator ttlisthere = splitmacroparam.begin();
+        text_tlist::iterator ttlistend = splitmacroparam.end();
+        while ((argnum > 1) && (ttlisthere != ttlistend)) {
+          argnum--;
+          ttlisthere++;
         }
-          else
-        {
-          // wasn't a option macro
-          needsexpansion = true;
-          tempmacrovalue.push_back(c);
-          hereit = savedhereit;
-          c = my_ttnextchar (hereit, endit);
+        if (ttlisthere != ttlistend) {
+          tempmacrovalue.append(*ttlisthere);
+          if (findchar((*ttlisthere).begin(), (*ttlisthere).end(), '_') != (*ttlisthere).end())
+            needsexpansion = true;
         }
+
+        c = my_ttnextchar (hereit, endit);
+
+          } else {
+        // wasn't a option macro
+        needsexpansion = true;
+        tempmacrovalue.push_back(c);
+        hereit = savedhereit;
+        c = my_ttnextchar (hereit, endit);
+          }
         }
       else