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

Timestamp:

Dec 16, 2007, 2:27:00 PM (18 years ago)

Author:

eugene

Message:

fixed cases of hard-wired line length; some api cleanup in stack_math

File:

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

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

@@ -22 +22 @@
   if (*Nstack == 1) {
     if (stack[0].type == 'S') {
-      free (tmp_stack.name);
+      clear_stack (&tmp_stack);
       return (TRUE);
     }
@@ -38 +38 @@
     }
     push_error ("syntax error: not a math expression");
-    free (tmp_stack.name);
+    clear_stack (&tmp_stack);
     return (FALSE);
   }      
@@ -63 +63 @@
         sprintf (line, "syntax error: binary operator with one operand: %s\n", stack[i].name);
         push_error (line);
-        free (tmp_stack.name); 
+        clear_stack (&tmp_stack);
         return (FALSE);
       }
@@ -84 +84 @@
         sprintf (line, "syntax error: invalid operand for binary operation: %s or %s\n", stack[i-1].name, stack[i-2].name);
         push_error (line);
-        free (tmp_stack.name);
+        clear_stack (&tmp_stack);
         return (FALSE);
       }
@@ -90 +90 @@
       delete_stack (&stack[i-1], 2);
       for (j = i + 1; j < *Nstack; j++) {
-        copy_stack (&stack[j - 2], &stack[j]);
+        move_stack (&stack[j - 2], &stack[j]);
       }
       *Nstack -= 2;
@@ -103 +103 @@
       if (i < 1) {  /* need one variable to operate on */
         push_error ("syntax error: unary operator with no operand");
-        free (tmp_stack.name);
-        return (FALSE);
-      }
-      
+        clear_stack (&tmp_stack);
+        return (FALSE);
+      }
+
       ONE_OP ("M", M_unary);
       ONE_OP ("V", V_unary);
@@ -114 +114 @@
       if (!strncasecmp (&stack[i - 1].type, "W", 1)) {
         push_error ("syntax error: no valid string unary ops");
-        free (tmp_stack.name);
+        clear_stack (&tmp_stack);
         return (FALSE);
       }
@@ -121 +121 @@
       delete_stack (&stack[i], 1);
       for (j = i + 1; j < *Nstack; j++) {
-        copy_stack (&stack[j - 1], &stack[j]);
+        move_stack (&stack[j - 1], &stack[j]);
       }
       init_stack (&tmp_stack);
@@ -129 +129 @@
     } 
   }
-  free (tmp_stack.name);
+  clear_stack (&tmp_stack);
 
   if (*Nstack > 1) {
@@ -153 +153 @@
 /* replace data with new stack variable */
 void move_stack (StackVar *stack1, StackVar *stack2) {
-  if (stack1[0].name != (char *) NULL) 
-    free (stack1[0].name);
+  clear_stack (stack1);
   copy_stack (stack1, stack2);
+  stack2[0].name = NULL;
 }
 
@@ -178 +178 @@
     }   
     if (VERBOSE) gprint (GP_ERR, "free %s (name) (%d) (%lx)\n", stack[i].name, i, (long) stack[i].name);
-    free (stack[i].name);
-    stack[i].name = NULL;
+    clear_stack (&stack[i]);
   }
 
@@ -188 +187 @@
   int i;
   for (i = 0; i < Nstack; i++) {
-    free (stack[i].name);
+    clear_stack (&stack[i]);
   }
 }
@@ -195 +194 @@
   stack[0].buffer = NULL;
   stack[0].vector = NULL;
-  stack[0].name = strncreate ("tmp", NCHARS);
-}
+  stack[0].name = NULL;
+}
+
+void assign_stack (StackVar *stack, char *name, int type) {
+  stack->name = strcreate (name);
+  stack->type = type;
+}
+
+void clear_stack (StackVar *stack) {
+  if (stack->name == NULL) return;
+  free (stack->name);
+  stack->name = NULL;
+  return;
+}