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

Timestamp:

Dec 16, 2007, 2:27:00 PM (19 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/convert_to_RPN.c (modified) (6 diffs)

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

@@ -97 +97 @@
         /* pop previous, higher operators from OP stack to stack */
         for (j = Nop_stack - 1; (j >= 0) && (op_stack[j].type > type); j--) {
-          strcpy (stack[Nstack].name, op_stack[j].name);
-          stack[Nstack].type = op_stack[j].type;
+          move_stack (&stack[Nstack], &op_stack[j]);
           Nstack ++;
           Nop_stack --;
         }
         /* push operator on OP stack */
-        strcpy (op_stack[Nop_stack].name, argv[i]);
-        op_stack[Nop_stack].type = type;
+        assign_stack (&op_stack[Nop_stack], argv[i], type);
         Nop_stack ++;
         break;
@@ -115 +113 @@
         /* pop previous, higher or equal operators from OP stack to stack */
         for (j = Nop_stack - 1; (j >= 0) && (op_stack[j].type >= type); j--) {
-          strcpy (stack[Nstack].name, op_stack[j].name);
-          stack[Nstack].type = op_stack[j].type;
+          move_stack (&stack[Nstack], &op_stack[j]);
           Nstack ++;
           Nop_stack --;
         }
         /* push operator on OP stack */
-        strcpy (op_stack[Nop_stack].name, argv[i]);
-        op_stack[Nop_stack].type = type;
+        assign_stack (&op_stack[Nop_stack], argv[i], type);
         Nop_stack ++;
         break;
       case 2:  
         /* push operator on OP stack */
-        strcpy (op_stack[Nop_stack].name, argv[i]);
-        op_stack[Nop_stack].type = type;
+        assign_stack (&op_stack[Nop_stack], argv[i], type);
         Nop_stack ++;
         break;
@@ -134 +129 @@
         /* pop rest of operators from OP stack to stack, looking for '(' */
         for (j = Nop_stack - 1; (j >= 0) && (op_stack[j].type != 2); j--) {
-          strcpy (stack[Nstack].name, op_stack[j].name);
-          stack[Nstack].type = op_stack[j].type;
+          move_stack (&stack[Nstack], &op_stack[j]);
           Nstack ++;
           Nop_stack --;
@@ -149 +143 @@
         /* place the value (number or vector/matrix name) on stack */
         /* value of 'X' is used as sentinel until we sort out values */
-        strcpy (stack[Nstack].name, argv[i]);
-        stack[Nstack].type = 'X';
+        assign_stack (&stack[Nstack], argv[i], 'X');
         Nstack ++;
         break;
@@ -163 +156 @@
       goto cleanup;
     }
-    strcpy (stack[Nstack].name, op_stack[j].name);
-    stack[Nstack].type = op_stack[j].type;
+    move_stack (&stack[Nstack],  &op_stack[j]);
     Nstack ++;
   }
@@ -170 +162 @@
 cleanup: 
   /*** free up unused stack space ***/
-  clean_stack (op_stack, NSTACK);
+
+  // XXX there should not be any un-freed op_stacks at this point
+  // clean_stack (op_stack, NSTACK);
   free (op_stack);
-  clean_stack (&stack[Nstack], NSTACK - Nstack);
+
+  // XXX there should not be any data on higher stack entries
+  // clean_stack (&stack[Nstack], NSTACK - Nstack);
   REALLOCATE (stack, StackVar, MAX (Nstack, 1));
   *nstack = Nstack;