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

Timestamp:

Dec 23, 2004, 7:36:01 AM (22 years ago)

Author:

eugene

Message:

fixed dvomath for strings

File:

• trunk/Ohana/src/opihi/lib.shell/evaluate_stack.c (modified) (6 diffs)

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

@@ -5 +5 @@
   
   int i, j, Nvar, Nout, status;
+  char line[512];
   StackVar tmp_stack;
   Nout = Nvar = 0;
@@ -26 +27 @@
       return (TRUE);
     }
-    push_error ("syntax error!");
+    push_error ("syntax error: not a math expression");
     free (tmp_stack.name);
     return (FALSE);
@@ -50 +51 @@
 
       if (i < 2) {  /* need two variables to operate on */
-        fprintf (stderr, "syntax error\n");
+        sprintf (line, "syntax error: binary operator with one operand: %s\n", stack[i].name);
+        push_error (line);
         free (tmp_stack.name); 
         return (FALSE);
@@ -123 +125 @@
 
       if (i < 1) {  /* need one variable to operate on */
-        fprintf (stderr, "syntax error\n");
+        push_error ("syntax error: unary operator with no operand");
         free (tmp_stack.name);
         return (FALSE);
@@ -137 +139 @@
       /* there are no valid unary string operators */
       if (!strncasecmp (&stack[i - 1].type, "W", 1)) {
-        fprintf (stderr, "syntax error\n");
+        push_error ("syntax error: no valid string unary ops");
         free (tmp_stack.name);
         return (FALSE);
@@ -156 +158 @@
 
   if (*Nstack > 1) {
-    fprintf (stderr, "syntax error\n");
+    push_error ("syntax error in evaluation");
     return (FALSE);
   }