Changeset 10662

Timestamp:

2005-09-28T16:51:04+12:00 (18 years ago)

Author:

kjdon

Message:

allow _If_(\"_macro_\" eq \"value\", true, false) as well as
_If_("_macro_" eq "value", true, false)
cos the former is what the GLI outputs for e.g. collectionextra.

File:

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

trunk/gsdl/lib/display.cpp

@@ -1391 +1391 @@
 // the two quoted strings are compared
 bool displayclass::boolexpr (const text_t &package, const text_t &expr, int recursiondepth) {
-
   if (expr.empty()) return false;
 
@@ -1401 +1400 @@
   }
   if (expexpr.empty() || expexpr == "0") return false;
-  if (expr[0] != '\"') return true;
-
+  // allow \" as start of exp as well as ", cos this is what the GLI writes out
+  if (expr[0] != '\"' && !(expr[0] == '\\' && expr[1] == '"')) {
+    return true;
+  }
   // don't use expexpr while separating quoted parts of
   // expression just in case expanded out macros contain
@@ -1424 +1425 @@
     op.clear();
     while (here != end) {
-      if (*here == '"') ++quotecount;
+      if (*here == '\\' && *(here+1) =='"') {
+    ++quotecount; // found an escaped quote
+    ++here;
+      }
+      else if (*here == '"') ++quotecount;
       else if (quotecount == 1) string1.push_back(*here);
       else if ((quotecount == 2) && !is_unicode_space (*here))