Changeset 181

Timestamp:

1999-03-02T09:39:54+13:00 (25 years ago)

Author:

sjboddie

Message:

Added eq and ne functionality to _If_

File:

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

trunk/gsdl/lib/display.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.10  1999/03/01 20:39:54  sjboddie
+   Added eq and ne functionality to _If_
+
    Revision 1.9  1999/03/01 01:18:09  sjboddie
 
@@ -981 +984 @@
 
 void displayclass::expandstring (text_t package, const text_t &inputtext,
-                text_t &outputtext, int recursiondepth)
+                 text_t &outputtext, int recursiondepth)
 {
   text_t macroname, macropackage, macroargs;
@@ -1213 +1216 @@
 }
 
+
+// evaluates a boolean expression
+// returns false if expr equals "" or "0". 
+// otherwise returns true *unless* expr is 
+// format "XXXX" eq/ne "dddd" in which case
+// the two quoted strings are compared
+bool displayclass::boolexpr (text_t package, const text_t &expr, int recursiondepth) {
+
+  if (expr.empty()) return false;
+
+  text_t expexpr;
+  if (package.empty()) package = "Global";  
+  expandstring (package, expr, expexpr, recursiondepth);
+
+  if (expexpr.empty() || expexpr == "0") return false;
+  if (expr[0] != '\"') return true;
+
+  // don't use expexpr while separating quoted parts of
+  // expression just in case expanded out macros contain
+  // quotes
+  text_t::const_iterator here = expr.begin();
+  text_t::const_iterator end = expr.end();
+
+  int quotecount = 0;
+  text_t string1, expstring1;
+  text_t string2, expstring2;
+  text_t op;
+  while (here != end) {
+    if (*here == '"') quotecount++;
+    else if (quotecount == 1) string1.push_back(*here);
+    else if ((quotecount == 2) && (*here != ' ') && (*here != '\n'))
+      op.push_back(*here);
+    else if (quotecount == 3) string2.push_back(*here);
+    else if (quotecount == 4) break;
+    here ++;
+  }
+  
+  expandstring (package, string1, expstring1, recursiondepth);
+  expandstring (package, string2, expstring2, recursiondepth);
+
+  if (op == "eq")
+    if (expstring1 == expstring2) return true;
+    else return false;
+  else if (op == "ne")
+    if (expstring1 != expstring2) return true;
+    else return false;
+  else 
+    return true; // any badly formatted string will return true
+}
+
+
 // (recursively) expand out a macro
 // returns true  if the macro was found
@@ -1265 +1319 @@
       // found a quoted section
       quote = c;
+      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==',') {
@@ -1288 +1344 @@
   }
 
-  // I'm only supporting a simple version of _If_ at the moment
   if (macroname == "If") {
     // get the condition, then clause and else clause
@@ -1315 +1370 @@
       
       // test the expanded string
-      if ((tmpoutput.size()) && (tmpoutput != "false") && (tmpoutput != "0")) {
+      if (boolexpr (macropackage, *paramcond, recursiondepth+1)) {
+    //(tmpoutput.size()) && (tmpoutput != "false") && (tmpoutput != "0")) {
     // true
     if (paramthen != paramend)