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

Timestamp:

Jun 17, 2005, 12:53:55 PM (21 years ago)

Author:

eugene

Message:

fixed up precedence

File:

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

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

@@ -1 +1 @@
 # include "opihi.h"
 # define VERBOSE 0
+
+# 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); 
+
+# define ONE_OP(A,FUNC) \
+  if (!strncasecmp (&stack[i - 1].type, A, 1)) \
+    status = FUNC (&tmp_stack, &stack[i - 1], stack[i].name); 
 
 int evaluate_stack (StackVar *stack, int *Nstack) {
@@ -48 +56 @@
 
     /***** binary operators *****/
-    if ((stack[i].type == 3) || (stack[i].type == 4) || (stack[i].type == 5) || (stack[i].type == 6)) {
+    if ((stack[i].type >= 3) && (stack[i].type <= 8)) {
 
       if (i < 2) {  /* need two variables to operate on */
@@ -56 +64 @@
         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);
@@ -91 +94 @@
 
     /***** unary operators **/
-    if (stack[i].type == 7) {
+    if (stack[i].type == 9) {
 
       if (i < 1) {  /* need one variable to operate on */
@@ -99 +102 @@
       }
       
-      if (!strncasecmp (&stack[i - 1].type, "M", 1)) 
-        M_unary (&tmp_stack, &stack[i - 1], stack[i].name);
-      if (!strncasecmp (&stack[i - 1].type, "V", 1)) 
-        V_unary (&tmp_stack, &stack[i - 1], stack[i].name);
-      if (!strncasecmp (&stack[i - 1].type, "S", 1)) 
-        S_unary (&tmp_stack, &stack[i - 1], stack[i].name);
+      ONE_OP ("M", M_unary);
+      ONE_OP ("V", V_unary);
+      ONE_OP ("S", S_unary);
 
       /* there are no valid unary string operators */