Changeset 40236

Timestamp:

Dec 3, 2017, 5:56:57 AM (9 years ago)

Author:

eugene

Message:

unary operators should always be pushed straight on the op-stack

Location:

branches/eam_branches/ohana.20170822/src/opihi/lib.shell

Files:

• convert_to_RPN.c (modified) (2 diffs)
• dvomath.c (modified) (1 diff)
• evaluate_stack.c (modified) (3 diffs)

branches/eam_branches/ohana.20170822/src/opihi/lib.shell/convert_to_RPN.c

@@ -120 +120 @@
         Nop_stack ++;
         break;
-      case ST_UNARY: 
       case ST_BINARY: 
       case ST_TRINARY:
@@ -139 +138 @@
         Nop_stack ++;
         break;
+      case ST_UNARY: 
       case ST_LEFT:  
         /* push operator on OP stack */

branches/eam_branches/ohana.20170822/src/opihi/lib.shell/dvomath.c

@@ -29 +29 @@
   unsigned int Ncstack;
   cstack = isolate_elements (argc, argv, &Ncstack); 
+
+  // for (i = 0; i < Ncstack; i++) {
+  //   fprintf (stderr, "%d : %s\n", i, cstack[i]);
+  // }
 
   /* generate RPN stack from cstack arguments */

branches/eam_branches/ohana.20170822/src/opihi/lib.shell/evaluate_stack.c

@@ -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);