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

Timestamp:

Jun 27, 2018, 3:20:35 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908/Ohana

Files:

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

branches/czw_branch/20170908/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);
@@ -186 +186 @@
       got_two_op:
         if (!status) {
-          snprintf (line, 512, "syntax error: invalid operand for binary operation: %s or %s\n", stack[i-1].name, stack[i-2].name);
+          // we are guaranteed to have stack[i-1] and stack[i-2] since i >= 2 (above)
+          char tmpvector[] = "Temporary Vector";
+          char tmpmatrix[] = "Temporary Matrix";
+          
+          char *name1 = NULL;
+          if (stack[i-1].name) {
+            name1 = stack[i-1].name;
+          } else {
+            if (stack[i-1].type == ST_VECTOR_TMP) name1 = tmpvector;
+            if (stack[i-1].type == ST_MATRIX_TMP) name1 = tmpmatrix;
+          }
+          char *name2 = NULL;
+          if (stack[i-2].name) {
+            name2 = stack[i-2].name;
+          } else {
+            if (stack[i-2].type == ST_VECTOR_TMP) name2 = tmpvector;
+            if (stack[i-2].type == ST_MATRIX_TMP) name2 = tmpmatrix;
+          }
+
+          snprintf (line, 512, "syntax error: invalid operand for binary operation: %s or %s\n", name1, name2);
           push_error (line);
+
           int isTrinary = TRUE;
           isTrinary = isTrinary && (i >= 2);
@@ -199 +219 @@
             push_error (line);
           }
+
           clear_stack (&tmp_stack);
           return (FALSE);