Changeset 3318 for trunk/Ohana/src/opihi/lib.shell/isolate_elements.c

Timestamp:

Feb 24, 2005, 3:44:00 PM (21 years ago)

Author:

eugene

Message:

allow quoted strings in math

File:

• trunk/Ohana/src/opihi/lib.shell/isolate_elements.c (modified) (2 diffs)

trunk/Ohana/src/opihi/lib.shell/isolate_elements.c

@@ -89 +89 @@
       /* operators */
       if (negate || minus || posate || plus || (IsAnOp (&in[i][j]) && !SciNotation)) {
-        if (posate) goto skip3;
+        if (posate) continue;
         EndOfString ();
         /* copy operator to out[Nout] */
@@ -100 +100 @@
         } 
         EndOfString ();
+        continue;
+      }
+      /* quoted string */
+      if (in[i][j] == '"') {
+        InsertValue (in[i][j]);
+        j++;
+        while ((j < strlen(in[i])) && (in[i][j] != '"')) {
+          InsertValue (in[i][j]);
+          j++;
+        }
+        if (in[i][j] != '"') continue;
+        /* 
+          fprintf (stderr, "mismatched quotes\n");
+          return (FALSE);
+        }
+        */
+        InsertValue (in[i][j]);
+        EndOfString ();
+        continue;
+      }
+      /* not an operator, not a quoted string */
+      if (!whitespace (in[i][j])) {
+        InsertValue (in[i][j]);
       } else {
-        if (!whitespace (in[i][j])) {
-          InsertValue (in[i][j]);
-        } else {
-          EndOfString ();
-        }
-      }
-    skip3:
-      continue;
+        EndOfString ();
+      }
     }
     EndOfString ();