Changeset 41489 for trunk/Ohana/src/opihi/lib.shell/parse.c

Timestamp:

Feb 9, 2021, 10:49:12 AM (5 years ago)

Author:

eugene

Message:

fix library order for pcontrol linkage; report buffer dimensions and NAXIS3 size; add file stats; allow string vector element assignment

File:

• trunk/Ohana/src/opihi/lib.shell/parse.c (modified) (4 diffs)

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

@@ -200 +200 @@
     }
 
-    /* find value for assignment */
-    V1 = nextcomm (line);
-    if (V1 == (char *) NULL) goto error;
-    if (V1[0] != '=') goto error;
-    V1 ++;
-
-    /*** assign vector element to value ***/
-    val = dvomath (1, &V1, &size, 0); 
-    if (val == (char *) NULL) {
-      print_error ();
-      goto error;
-    }
-
-    /* find vector */
+    /* find vector or buffer (check for valid element)*/
     if (isBuffer) {
+      // unknown buffer name
       if ((buf = SelectBuffer (V0, OLDBUFFER, TRUE)) == NULL) goto error;
       free (V0); V0 = (char *) NULL;
@@ -229 +217 @@
       if (Nx < 0) Nx += buf[0].header.Naxis[0];
       if (Ny < 0) Ny += buf[0].header.Naxis[1];
-
-      fptr = (float *) buf[0].matrix.buffer;
-      fptr[Nx + Ny*buf[0].header.Naxis[0]] = atof (val);
     } else {
       if ((vec = SelectVector (V0, OLDVECTOR, TRUE)) == NULL) goto error;
@@ -244 +229 @@
       }
       if (Nx < 0) Nx += vec[0].Nelements;
+    }
+
+    /* find value for assignment */
+    V1 = nextcomm (line);
+    if (V1 == (char *) NULL) goto error;
+    if (V1[0] != '=') goto error;
+    V1 ++;
+
+    /*** assign vector (or buffer) element to value ***/
+    val = dvomath (1, &V1, &size, 0); 
+    if (val == NULL) { 
+      if (!isBuffer && (vec->type == OPIHI_STR)) {
+        while (OHANA_WHITESPACE (*V1)) V1++;
+        val = strcreate (V1);
+        init_error ();
+      } else {
+        print_error ();
+        goto error;
+      }
+    }
+
+    /* find vector */
+    if (isBuffer) {
+      fptr = (float *) buf[0].matrix.buffer;
+      fptr[Nx + Ny*buf[0].header.Naxis[0]] = atof (val);
+    } else {
       if (vec[0].type == OPIHI_FLT) {
         vec[0].elements.Flt[Nx] = atof (val);
-      } else {
+      } 
+      if (vec[0].type == OPIHI_INT) {
         vec[0].elements.Int[Nx] = atoll (val);
       }
+      if (vec[0].type == OPIHI_STR) {
+        vec[0].elements.Str[Nx] = strcreate (val);
+      } 
     }
     goto escape;
@@ -359 +374 @@
 
 /* case 3: we hunt for '{', and then the first '}' and pass everything
-   inbetween.  no nested {{}}s are allowed! */
+   in between.  no nested {{}}s are allowed! */
   
 /* thisword ALLOCATES