Changeset 42165 for branches/eam_branches/ipp-20220316/Ohana/src/opihi/lib.shell/stack_math.c

Timestamp:

Apr 8, 2022, 5:01:57 PM (4 years ago)

Author:

eugene

Message:

fix string-vector assignment; fix while loop logic involving vector or matrix sizes

File:

• branches/eam_branches/ipp-20220316/Ohana/src/opihi/lib.shell/stack_math.c (modified) (1 diff)

branches/eam_branches/ipp-20220316/Ohana/src/opihi/lib.shell/stack_math.c

@@ -1706 +1706 @@
   char line[512]; // this is only used to report an error 
   snprintf (line, 512, "error: op %s not defined as unary vector op!", op);
+  push_error (line);
+  return (FALSE);
+
+escape:
+
+  if (V1[0].type == ST_VECTOR_TMP) {
+    free (V1[0].vector[0].elements.Ptr);
+    free (V1[0].vector);
+    V1[0].vector = NULL;
+  }  
+
+  clear_stack (V1);
+  return (TRUE);
+
+}
+
+// vector string operations
+int L_unary (StackVar *OUT, StackVar *V1, char *op) {
+
+  int Nx = V1[0].vector[0].Nelements;
+
+  OUT[0].vector = InitVector ();
+  OUT[0].type = ST_VECTOR_TMP; /*** <<--- says this is a temporary matrix ***/
+
+  ResetVector (OUT[0].vector, OPIHI_STR, V1[0].vector[0].Nelements); 
+  char **Iv =  V1[0].vector[0].elements.Str; 
+  char **Ov = OUT[0].vector[0].elements.Str; 
+  if (!strcmp (op, "=")) {
+    for (int i = 0; i < Nx; i++) {                      
+      Ov[i] = strcreate (Iv[i]);
+    }                                                                   
+    goto escape;                                                        
+  }
+
+  // free the temp vector if needed
+  if (V1[0].type == ST_VECTOR_TMP) {
+    // XXX this probably does not free the strings
+    free (V1[0].vector[0].elements.Ptr);
+    free (V1[0].vector);
+    V1[0].vector = NULL;
+  }  
+
+  clear_stack (V1);
+
+  char line[512]; // this is only used to report an error 
+  snprintf (line, 512, "error: op %s not defined as unary string vector op!", op);
   push_error (line);
   return (FALSE);