Changeset 40013 for trunk

Timestamp:

Apr 13, 2017, 5:39:59 AM (9 years ago)

Author:

eugene

Message:

order of operators matches convert_to_RPN.c; add missing ops , : ? %

File:

• trunk/Ohana/src/libohana/src/isolate_elements.c (modified) (2 diffs)

trunk/Ohana/src/libohana/src/isolate_elements.c

@@ -130 +130 @@
       }
     }
-        myOutput = EndOfString (myOutput, &Nout, &Nchar, &NOUT, &NCHAR);
+    myOutput = EndOfString (myOutput, &Nout, &Nchar, &NOUT, &NCHAR);
   }
 
@@ -169 +169 @@
 int IsAnOp (char *c) {
 
+  // order matches convert_to_RPN.c
+  if (!strncmp (c, "?",  1)) return (TRUE);
+  if (!strncmp (c, ":",  1)) return (TRUE);
+
+  if (!strncmp (c, "^",  1)) return (TRUE);
+
+  if (!strncmp (c, ",",  1)) return (TRUE);
+  if (!strncmp (c, "@",  1)) return (TRUE);
+  if (!strncmp (c, "/",  1)) return (TRUE);
   if (!strncmp (c, "*",  1)) return (TRUE);
-  if (!strncmp (c, "/",  1)) return (TRUE);
+  if (!strncmp (c, "%",  1)) return (TRUE);
+
   if (!strncmp (c, "+",  1)) return (TRUE);
   if (!strncmp (c, "-",  1)) return (TRUE);
-  if (!strncmp (c, "^",  1)) return (TRUE);
-  if (!strncmp (c, "@",  1)) return (TRUE);
+  if (!strncmp (c, "&",  1)) return (TRUE);
+  if (!strncmp (c, "|",  1)) return (TRUE);
+
+  if (!strncmp (c, "<",  1)) return (TRUE);
+  if (!strncmp (c, ">",  1)) return (TRUE);
+
   if (!strncmp (c, "(",  1)) return (TRUE);
   if (!strncmp (c, ")",  1)) return (TRUE);
-  if (!strncmp (c, "&",  1)) return (TRUE);
-  if (!strncmp (c, "|",  1)) return (TRUE);
-  if (!strncmp (c, ">",  1)) return (TRUE);
-  if (!strncmp (c, "<",  1)) return (TRUE);
-  if (!strncmp (c, "<",  1)) return (TRUE);
+
   if (!strncmp (c, "<<", 2)) return (TRUE);
   if (!strncmp (c, ">>", 2)) return (TRUE);