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

Timestamp:

Dec 7, 2008, 3:31:01 PM (17 years ago)

Author:

eugene

Message:

big update from eam_branch_20081124 with updates to Opihi math

File:

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

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

@@ -21 +21 @@
 
   if (*Nstack == 1) {
-    if (stack[0].type == 'S') {
+    if ((stack[0].type == 'S') || (stack[0].type == 's')) {
       clear_stack (&tmp_stack);
       return (TRUE);
@@ -140 +140 @@
 /* copy data to new stack variable */
 void copy_stack (StackVar *stack1, StackVar *stack2) {
-  stack1[0].name   = stack2[0].name  ;
-  stack1[0].type   = stack2[0].type  ;
-  stack1[0].ptr    = stack2[0].ptr   ;
-  stack1[0].buffer = stack2[0].buffer;
-  stack1[0].vector = stack2[0].vector;
-  stack1[0].Float  = stack2[0].Float ;
-  if (!strncasecmp (&stack1[0].type, "S", 1)) {
-    stack1[0].ptr    = &stack1[0].Float;
-  }
+  stack1[0].name     = stack2[0].name  ;
+  stack1[0].type     = stack2[0].type  ;
+  stack1[0].buffer   = stack2[0].buffer;
+  stack1[0].vector   = stack2[0].vector;
+  stack1[0].FltValue = stack2[0].FltValue;
+  stack1[0].IntValue = stack2[0].IntValue;
 }
 
@@ -173 +170 @@
     if (IsVectorPtr (stack[i].vector) && (stack[i].type == 'v')) {
       if (VERBOSE) gprint (GP_ERR, "free %s (vect) (%lx)\n", stack[i].name, (long) stack[i].vector);
-      free (stack[i].vector[0].elements);
+      free (stack[i].vector[0].elements.Ptr);
       free (stack[i].vector);
       stack[i].vector = NULL;