Changeset 42311

Timestamp:

Dec 1, 2022, 10:01:56 AM (4 years ago)

Author:

eugene

Message:

enable subset for string-type vectors; allow "set a = b" for string-type vectors

Location:

trunk/Ohana/src/opihi

Files:

• cmd.data/subset.c (modified) (1 diff)
• lib.shell/stack_math.c (modified) (1 diff)

trunk/Ohana/src/opihi/cmd.data/subset.c

@@ -81 +81 @@
     }
   }
+  if ((ivec->type == OPIHI_STR) && (tvec->type == OPIHI_FLT)) {
+    opihi_flt *vt = tvec[0].elements.Flt;
+    for (Npts = i = 0; i < tvec[0].Nelements; i++, vt++) {
+      if (!*vt) continue;
+      ovec[0].elements.Str[Npts] = strcreate (ivec[0].elements.Str[i]);
+      Npts++;
+    }
+  }
+  if ((ivec->type == OPIHI_STR) && (tvec->type == OPIHI_INT)) {
+    opihi_int *vt = tvec[0].elements.Int;
+    for (Npts = i = 0; i < tvec[0].Nelements; i++, vt++) {
+      if (!*vt) continue;
+      ovec[0].elements.Str[Npts] = strcreate (ivec[0].elements.Str[i]);
+      Npts++;
+    }
+  }
 
   // free up unused memory

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

@@ -1619 +1619 @@
   OUT[0].vector = InitVector ();
   OUT[0].type = ST_VECTOR_TMP; /*** <<--- says this is a temporary matrix ***/
+
+  if (V1->vector->type == OPIHI_STR) {
+    ResetVector (OUT->vector, V1->vector->type, V1->vector->Nelements);
+    for (i = 0; i < V1->vector->Nelements; i++) {
+      OUT->vector->elements.Str[i] = strcreate (V1->vector->elements.Str[i]);
+    }
+    goto escape;
+  }
 
 # define V_FUNC(OP,FTYPE) {                                             \