Changeset 6250

Timestamp:

Jan 29, 2006, 9:59:45 AM (20 years ago)

Author:

eugene

Message:

fixed evaluation of zero-padded ints

Location:

trunk/Ohana/src/opihi/lib.shell

Files:

• check_stack.c (modified) (2 diffs)
• dvomath.c (modified) (2 diffs)
• evaluate_stack.c (modified) (2 diffs)

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

@@ -14 +14 @@
       stack[i].Float = strtod (stack[i].name, &c);
       if (c == stack[i].name + strlen (stack[i].name)) {
-        # if (0)
-        if (Nstack == 1) {
-          stack[i].type = 'W';
-        } else {
-          stack[i].ptr   = &(stack[i].Float);
-          stack[i].type  = 'S';
-        }
-        # endif
         stack[i].ptr   = &(stack[i].Float);
         stack[i].type  = 'S';
@@ -71 +63 @@
       /* this is not a scalar, vector, or matrix.  must be string */
       stack[i].type  = 'W';
-        
-      /* let's not consider this an error 
-      sprintf (line, "unknown object %s", stack[i].name);
-      push_error (line);
-      return (-1); 
-      */
     }
   }

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

@@ -57 +57 @@
 
   /* evaluate operations, free stack on error */
+  Ncstack = Nstack;
   if (!evaluate_stack (stack, &Nstack)) {
     if (*size == 1) DeleteVector (vec);
@@ -65 +66 @@
   switch (*size) {
     case 0:
-      sprintf (outname, "%.12g", stack[0].Float);
+      if (Ncstack == 1) {
+          /* use exact input work */
+          sprintf (outname, "%s", stack[0].name);
+      } else {
+          sprintf (outname, "%.12g", stack[0].Float);
+      }
       break;
 

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

@@ -22 +22 @@
   if (*Nstack == 1) {
     if (stack[0].type == 'S') {
-      S_unary (&tmp_stack, &stack[0], "=");
-      move_stack (&stack[0], &tmp_stack);
       return (TRUE);
     }
     if (stack[0].type == 'V') {
+      /* need to make a copy so we set output value? */
       V_unary (&tmp_stack, &stack[0], "=");
       move_stack (&stack[0], &tmp_stack);
@@ -32 +31 @@
     }
     if (stack[0].type == 'M') {
+      /* need to make a copy so we set output value? */
       M_unary (&tmp_stack, &stack[0], "=");
       move_stack (&stack[0], &tmp_stack);