Changeset 40291 for trunk/Ohana/src/opihi/lib.shell/evaluate_stack.c

Timestamp:

Dec 13, 2017, 10:53:48 AM (9 years ago)

Author:

eugene

Message:

merge EAM development branch changes for DR2 into trunk (add PS1_V6 dvo format; change Mcal to McalPSF, McalAPER; change opihi int vectors to 64bit)

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/lib.shell/evaluate_stack.c (modified) (5 diffs)

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

@@ -89 +89 @@
       }
       if (tmp_stack.type == ST_SCALAR_INT) {
-        gprint (GP_ERR, "---> %d ", tmp_stack.IntValue);
+        gprint (GP_ERR, "---> "OPIHI_INT_FMT" ", tmp_stack.IntValue);
       }
       if (tmp_stack.type == ST_SCALAR_FLT) {
@@ -110 +110 @@
 
         if (i < 3) {  /* need two variables to operate on */
-          snprintf (line, 512, "syntax error: trinary operator without three operands: %s\n", stack[i].name);
+          snprintf (line, 512, "syntax error: trinary operator without three operands: %s\n(Note that the : in a trinary operation must be protected by spaces", stack[i].name);
           push_error (line);
           clear_stack (&tmp_stack);
@@ -124 +124 @@
 
         /* there are no valid unary string operators */
-        snprintf (line, 512, "invalid operands for trinary operator %s (mismatch types?)", stack[i].name);
+        snprintf (line, 512, "invalid operands for trinary operator %s (mismatch types?)\n(Note that the : in a trinary operation must be protected by spaces)", stack[i].name);
         push_error (line);
         clear_stack (&tmp_stack);
@@ -131 +131 @@
       got_three_op:
         if (!status) {
-          snprintf (line, 512, "syntax error: invalid operand for trinary operation: %s or %s or %s\n", stack[i-1].name, stack[i-2].name, stack[i-3].name);
+          snprintf (line, 512, "syntax error: invalid operand for trinary operation: %s or %s or %s\n(Note that the : in a trinary operation must be protected by spaces)", stack[i-1].name, stack[i-2].name, stack[i-3].name);
           push_error (line);
           clear_stack (&tmp_stack);
@@ -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);