Changeset 20936 for trunk/Ohana/src/opihi/lib.shell/check_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/check_stack.c (modified) (4 diffs)

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

@@ -4 +4 @@
 
   int i, Nx, Ny, Nv, size;
-  char *c;
+  char *c1, *c2;
 
   Nv = Nx = Ny = -1;
@@ -11 +11 @@
     if (stack[i].type == 'X') {
 
-      /** if this is a number, put it on the list of scalers and move on **/
-      stack[i].Float = strtod (stack[i].name, &c);
-      if (c == stack[i].name + strlen (stack[i].name)) {
-        stack[i].ptr   = &(stack[i].Float);
-        stack[i].type  = 'S';
+      /** if this is a number, put it on the list of scalars and move on.  assume value is
+       * an int unless proven otherwise **/
+      stack[i].FltValue = strtod (stack[i].name, &c1);
+      stack[i].IntValue = strtol (stack[i].name, &c2, 0);
+      if (c2 == stack[i].name + strlen (stack[i].name)) {
+        stack[i].type  = 's'; // 's' == (int)
+        continue;
+      } 
+      if (c1 == stack[i].name + strlen (stack[i].name)) {
+        stack[i].type  = 'S'; // 'S' == (float)
         continue;
       } 
@@ -22 +27 @@
       if (IsBuffer (stack[i].name)) {
         stack[i].buffer = SelectBuffer (stack[i].name, OLDBUFFER, TRUE);
-        stack[i].ptr    = (float *) stack[i].buffer[0].matrix.buffer;
         stack[i].type   = 'M';
         if (Nx == -1) {
@@ -44 +48 @@
       if (IsVector (stack[i].name)) {
         stack[i].vector = SelectVector (stack[i].name, OLDVECTOR, FALSE);
-        stack[i].ptr    = (float *) stack[i].vector[0].elements;
         stack[i].type   = 'V';