Changeset 36375 for trunk/Ohana/src/opihi/lib.shell/check_stack.c

Timestamp:

Dec 10, 2013, 2:55:11 PM (12 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20130904

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi (modified) (1 prop)
• Ohana/src/opihi/lib.shell/check_stack.c (modified) (5 diffs)

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

@@ -12 +12 @@
 
   for (i = 0; i < Nstack; i++) {
-    if (stack[i].type == 'X') {
+    if (stack[i].type == ST_VALUE) {
 
       /** if this is a number, put it on the list of scalars and move on.  assume value is
@@ -27 +27 @@
       stack[i].IntValue = strtol (stack[i].name, &c2, 0);
       if ((fabs(stack[i].FltValue) > MAX_INT) && (c1 == stack[i].name + strlen (stack[i].name))) {
-        stack[i].type  = 'S'; // 'S' == (float)
+        stack[i].type  = ST_SCALAR_FLT; // (float)
         continue;
       } 
       if (c2 == stack[i].name + strlen (stack[i].name)) {
-        stack[i].type  = 's'; // 's' == (int)
+        stack[i].type  = ST_SCALAR_INT; // (int)
         continue;
       } 
       if (c1 == stack[i].name + strlen (stack[i].name)) {
-        stack[i].type  = 'S'; // 'S' == (float)
+        stack[i].type  = ST_SCALAR_FLT; // (float)
         continue;
       } 
@@ -42 +42 @@
       if (IsBuffer (stack[i].name)) {
         stack[i].buffer = SelectBuffer (stack[i].name, OLDBUFFER, TRUE);
-        stack[i].type   = 'M';
+        stack[i].type   = ST_MATRIX;
         if (Nx == -1) {
           Nx = stack[i].buffer[0].matrix.Naxis[0];
@@ -63 +63 @@
       if (IsVector (stack[i].name)) {
         stack[i].vector = SelectVector (stack[i].name, OLDVECTOR, FALSE);
-        stack[i].type   = 'V';
+        stack[i].type   = ST_VECTOR;
 
         if (Nv == -1) Nv = stack[i].vector[0].Nelements;
@@ -80 +80 @@
 
       /* this is not a scalar, vector, or matrix.  must be string */
-      stack[i].type  = 'W';
+      stack[i].type  = ST_STRING;
     }
   }