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

Timestamp:

Dec 22, 2004, 1:23:23 PM (22 years ago)

Author:

eugene

Message:

fixing dvomath for strings

File:

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

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

@@ -26 +26 @@
       return (TRUE);
     }
-    fprintf (stderr, "syntax error!\n");
+    push_error ("syntax error!");
     free (tmp_stack.name);
     return (FALSE);
@@ -54 +54 @@
         return (FALSE);
       }
+
+      /* this could be macro generated... */
+      # define TWO_OP(A,B,FUNC) \
+      if (!strncasecmp (&stack[i - 2].type, A, 1) && !strncasecmp (&stack[i - 1].type, B, 1)) \
+        status = FUNC (&tmp_stack, &stack[i - 2], &stack[i - 1], stack[i].name); 
+
+      TWO_OP ("M","M",MM_binary);
+      TWO_OP ("M","V",MV_binary);
+      TWO_OP ("M","S",MS_binary);
+      TWO_OP ("V","M",VM_binary);
+      TWO_OP ("V","V",VV_binary);
+      TWO_OP ("V","S",VS_binary);
+      TWO_OP ("S","M",SM_binary);
+      TWO_OP ("S","V",SV_binary);
+      TWO_OP ("S","S",SS_binary);      
+      TWO_OP ("W","W",WW_binary);      
+      
+      /*
       if (!strncasecmp (&stack[i - 2].type, "V", 1) && !strncasecmp (&stack[i - 1].type, "V", 1)) 
         status = VV_binary (&tmp_stack, &stack[i - 2], &stack[i - 1], stack[i].name);
@@ -72 +90 @@
       if (!strncasecmp (&stack[i - 2].type, "S", 1) && !strncasecmp (&stack[i - 1].type, "S", 1)) 
         status = SS_binary (&tmp_stack, &stack[i - 2], &stack[i - 1], stack[i].name);
+      if (!strncasecmp (&stack[i - 2].type, "X", 1) && !strncasecmp (&stack[i - 1].type, "X", 1)) 
+        status = XX_binary (&tmp_stack, &stack[i - 2], &stack[i - 1], stack[i].name);
+      */
+
+      /* string op number is not valid */
+      if (!strncasecmp (&stack[i - 2].type, "W", 1) && strncasecmp (&stack[i - 1].type, "W", 1)) {
+        free (tmp_stack.name);
+        return (FALSE);
+      }
+      if (strncasecmp (&stack[i - 2].type, "W", 1) && !strncasecmp (&stack[i - 1].type, "W", 1)) {
+        free (tmp_stack.name);
+        return (FALSE);
+      }
+
       if (!status) {
         free (tmp_stack.name);
@@ -102 +134 @@
       if (!strncasecmp (&stack[i - 1].type, "S", 1)) 
         S_unary (&tmp_stack, &stack[i - 1], stack[i].name);
+
+      /* there are no valid unary string operators */
+      if (!strncasecmp (&stack[i - 1].type, "W", 1)) {
+        fprintf (stderr, "syntax error\n");
+        free (tmp_stack.name);
+        return (FALSE);
+      }
 
       move_stack (&stack[i-1], &tmp_stack);