Changeset 40205

Timestamp:

Nov 8, 2017, 9:54:15 AM (9 years ago)

Author:

eugene

Message:

do not split : into an isolated element unless protected by whitespace; give clearer warning if trinary expression uses unprotected :

Location:

branches/czw_branch/20170908/Ohana/src

Files:

• libohana/src/isolate_elements.c (modified) (1 diff)
• opihi/lib.shell/evaluate_stack.c (modified) (1 diff)

branches/czw_branch/20170908/Ohana/src/libohana/src/isolate_elements.c

@@ -171 +171 @@
   // 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);

branches/czw_branch/20170908/Ohana/src/opihi/lib.shell/evaluate_stack.c

@@ -188 +188 @@
           snprintf (line, 512, "syntax error: invalid operand for binary operation: %s or %s\n", stack[i-1].name, stack[i-2].name);
           push_error (line);
+          if (strchr(stack[i-1].name, ':') || strchr(stack[i-2].name, ':')) {
+            snprintf (line, 512, "syntax error: invalid operand for binary operation: %s or %s\n(Note that the : in a trinary operation must be protected by spaces)\n", stack[i-1].name, stack[i-2].name);
+            push_error (line);
+          }
           clear_stack (&tmp_stack);
           return (FALSE);