Changeset 41363 for trunk/Ohana/src/opihi/lib.shell/stack_math.c

Timestamp:

May 23, 2020, 11:34:29 AM (6 years ago)

Author:

eugene

Message:

add string-vector ops

File:

• trunk/Ohana/src/opihi/lib.shell/stack_math.c (modified) (2 diffs)

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

@@ -272 +272 @@
   if (V1[0].vector[0].Nelements != V2[0].vector[0].Nelements) {
     return (FALSE);
+  }
+
+  if ((V1->vector->type == OPIHI_STR) && (V2->vector->type == OPIHI_STR)) {
+    int status = LL_binary (OUT, V1, V2, op);
+    return status;
   }
 
@@ -1315 +1320 @@
   return (TRUE);
 
+}
+
+// vector string OP scalar string (called if V1 is vector, V2 is string)
+// V1 MUST be a string-valued vector
+int LW_binary (StackVar *OUT, StackVar *V1, StackVar *V2, char *op) {
+
+  char line[512]; // this is only used to report an error 
+
+  if (V1->vector->type != OPIHI_STR) {
+    snprintf (line, 512, "error: binary operation between numerical vector and string not defined");
+    push_error (line);
+    return (FALSE);
+  }
+
+  /* only 'N' and 'E' are allowed for WW_binary operations. anything else is either a
+     syntax error or is a string which looks like a math expression. */
+
+  if ((op[0] != 'N') && (op[0] != 'E')) {
+    snprintf (line, 512, "error: op %c not defined for vector string operations!", op[0]);
+    push_error (line);
+    return (FALSE);
+  }
+
+  int Nx = V1[0].vector[0].Nelements;
+
+  OUT[0].vector = InitVector ();
+  OUT[0].type = ST_VECTOR_TMP;   /*** <<--- says this is a temporary matrix ***/
+
+  /* evaluate stack will only call WW_binary with one numerical value,
+     and only in the case that the string did not parse to a number 
+     thus: string == number -> false */
+
+  // output vector is an integer (result of strcmp test)
+  MatchVector (OUT[0].vector, V1[0].vector, OPIHI_INT);
+  opihi_int *out = OUT[0].vector[0].elements.Int;
+
+  // remove the quotes around the name (string value) here
+  char *M2 = clean_stack_name(V2[0].name);
+
+  for (int i = 0; i < Nx; i++, out++) {
+    char *M1 =  V1[0].vector[0].elements.Str[i];
+    if (op[0] == 'E') {
+      //     *out = (M1 == NULL) || strcmp(M1, M2) ? 0 : 1;
+      *out = strcmp(M1, M2) ? 0 : 1;
+    }
+    if (op[0] == 'N') {
+      *out = strcmp(M1, M2) ? 1 : 0;
+    }
+  }
+
+  clear_stack (V1);
+  clear_stack (V2);
+  FREE (M2);
+
+  /* at the end, V1 and V2 are deleted only if they were temporary */
+  return (TRUE);
+}
+
+// vector string OP scalar string (called if V2 is vector, V1 is string)
+// V2 MUST be a string-valued vector
+int WL_binary (StackVar *OUT, StackVar *V1, StackVar *V2, char *op) {
+
+  char line[512]; // this is only used to report an error 
+
+  if (V2->vector->type != OPIHI_STR) {
+    snprintf (line, 512, "error: binary operation between numerical vector and string not defined");
+    push_error (line);
+    return (FALSE);
+  }
+
+  /* only 'N' and 'E' are allowed for WW_binary operations. anything else is either a
+     syntax error or is a string which looks like a math expression. */
+
+  if ((op[0] != 'N') && (op[0] != 'E')) {
+    snprintf (line, 512, "error: op %c not defined for vector string operations!", op[0]);
+    push_error (line);
+    return (FALSE);
+  }
+
+  int Nx = V2[0].vector[0].Nelements;
+
+  OUT[0].vector = InitVector ();
+  OUT[0].type = ST_VECTOR_TMP;   /*** <<--- says this is a temporary matrix ***/
+
+  /* evaluate stack will only call WW_binary with one numerical value,
+     and only in the case that the string did not parse to a number 
+     thus: string == number -> false */
+
+  // output vector is an integer (result of strcmp test)
+  MatchVector (OUT[0].vector, V2[0].vector, OPIHI_INT);
+  opihi_int *out = OUT[0].vector[0].elements.Int;
+
+  // remove the quotes around the name (string value) here
+  char *M1 = clean_stack_name(V1[0].name);
+
+  for (int i = 0; i < Nx; i++, out++) {
+    char *M2 =  V2[0].vector[0].elements.Str[i];
+    if (op[0] == 'E') {
+      *out = strcmp(M1, M2) ? 0 : 1;
+    }
+    if (op[0] == 'N') {
+      *out = strcmp(M1, M2) ? 1 : 0;
+    }
+  }
+
+  clear_stack (V1);
+  clear_stack (V2);
+  FREE (M1);
+
+  /* at the end, V1 and V2 are deleted only if they were temporary */
+  return (TRUE);
+}
+
+// vector string OP vector string (called by VV_binary above if both V1 & V2 are vector strings)
+int LL_binary (StackVar *OUT, StackVar *V1, StackVar *V2, char *op) {
+
+  char line[512]; // this is only used to report an error 
+
+  if ((V1->vector->type != OPIHI_STR) || (V2->vector->type != OPIHI_STR)) {
+    snprintf (line, 512, "error: binary operations between numerical vector and string vector not defined");
+    push_error (line);
+    return (FALSE);
+  }
+
+  /* only 'N' and 'E' are allowed for WW_binary operations. anything else is either a
+     syntax error or is a string which looks like a math expression. */
+
+  if ((op[0] != 'N') && (op[0] != 'E')) {
+    snprintf (line, 512, "error: op %c not defined for vector string operations!", op[0]);
+    push_error (line);
+    return (FALSE);
+  }
+
+  int Nx = V1[0].vector[0].Nelements;
+
+  OUT[0].vector = InitVector ();
+  OUT[0].type = ST_VECTOR_TMP;   /*** <<--- says this is a temporary matrix ***/
+
+  // output vector is an integer (result of strcmp test)
+  MatchVector (OUT[0].vector, V1[0].vector, OPIHI_INT);
+  opihi_int *out = OUT[0].vector[0].elements.Int;
+
+  char **M1 =  V1[0].vector[0].elements.Str;
+  char **M2 =  V2[0].vector[0].elements.Str;
+
+  for (int i = 0; i < Nx; i++, out++, M1++, M2++) {
+    if (op[0] == 'E') {
+      *out = strcmp(*M1, *M2) ? 0 : 1;
+    }
+    if (op[0] == 'N') {
+      *out = strcmp(*M1, *M2) ? 1 : 0;
+    }
+  }
+
+  clear_stack (V1);
+  clear_stack (V2);
+
+  /* at the end, V1 and V2 are deleted only if they were temporary */
+  return (TRUE);
 }