Changeset 636

Timestamp:

1999-09-29T08:38:19+12:00 (25 years ago)

Author:

rjmcnab

Message:

fixed a couple of bugs

File:

• trunk/gsdl/src/recpt/formattools.cpp (modified) (4 diffs)

trunk/gsdl/src/recpt/formattools.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.11  1999/09/28 20:38:19  rjmcnab
+   fixed a couple of bugs
+
    Revision 1.10  1999/09/07 04:56:55  sjboddie
    added GPL notice
@@ -300 +303 @@
       text.push_back (*here);
 
-    here ++;
+    if (here != end) here ++;
   }
   if (!text.empty()) {
@@ -333 +336 @@
   text_t text;
   while (here != end) {
-    if (*here == '{') {curlycount ++; text.push_back(*here);}
+
+    if (*here == '\\') {
+      here++;
+      if (here != end) text.push_back(*here);
+      
+    } else if (*here == '{') {curlycount ++; text.push_back(*here);}
     else if (*here == '}' && curlycount > 0) {
       curlycount --; 
@@ -405 +413 @@
       }
       if (*here == '}') break;
-    }
-
-    else 
-      text.push_back(*here);
+      
+    } else text.push_back(*here);
     
-    here ++;
+    if (here != end) here ++;
   }