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

Timestamp:

Dec 22, 2004, 1:23:23 PM (22 years ago)

Author:

eugene

Message:

fixing dvomath for strings

File:

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

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

@@ -1 +1 @@
 # include "opihi.h"
 
-int check_stack (StackVar *stack, int Nstack) {
+int check_stack (StackVar *stack, int Nstack, int validsize) {
 
-  int i, Nx, Ny, Nv;
+  int i, Nx, Ny, Nv, size;
   char *c, line[128];
 
@@ -10 +10 @@
   for (i = 0; i < Nstack; i++) {
     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);
@@ -17 +18 @@
         continue;
       } 
+
+      /** if we demand a scalar, interpret strings as strings */
+      if (validsize == 0) {
+        stack[i].type  = 'W';
+        continue;
+      } 
+        
       /** if this is a matrix, find the dimensions and check with existing values **/
       if (IsBuffer (stack[i].name)) {
@@ -38 +46 @@
         continue;
       }
+
       /** if this is a vector, find the dimensions and check with existing values **/
       if (IsVector (stack[i].name)) {
@@ -63 +72 @@
   }
 
-  /* we return a value which is 1 greater than the object dimension */
-  if (Nx != -1) return (2);
-  if (Nv != -1) return (1);
-  return (0);
+  /* return object dimensions */
+  size = 0;
+  if (Nv != -1) size = 1;
+  if (Nx != -1) size = 2;
+  if (validsize == -1)   return (size);
+  if (validsize != size) return (-1);
+  return (size);
 }