Changeset 41363 for trunk/Ohana/src/opihi/lib.shell/evaluate_stack.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/evaluate_stack.c (modified) (3 diffs)

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

@@ -30 +30 @@
 
 // A & B value types all have 2 possible values
+// 
 # define TWO_OP(A,B,FUNC) {                                             \
     if ((stack[i - 2].type == A) && (stack[i - 1].type == B)) {         \
@@ -163 +164 @@
         }
 
+        // TWO_OP(A,B,OP) : A,B types all have a main value and a secondary value at A+1 or B+1:
+        // ST_MATRIX -> ST_MATRIX_TMP
+        // ST_VECTOR -> ST_VECTOR_TMP
+        // ST_SCALAR_INT -> ST_SCALAR_FLT 
         status = FALSE;
         TWO_OP (ST_MATRIX,ST_MATRIX,MM_binary);
         TWO_OP (ST_MATRIX,ST_VECTOR,MV_binary);
-        TWO_OP (ST_MATRIX,ST_SCALAR_INT,MS_binary);
+        TWO_OP (ST_MATRIX,ST_SCALAR_INT,MS_binary); // handles ST_SCALAR_INT and ST_SCALAR_FLT 
 
         TWO_OP (ST_VECTOR,ST_MATRIX,VM_binary);
         TWO_OP (ST_VECTOR,ST_VECTOR,VV_binary);
-        TWO_OP (ST_VECTOR,ST_SCALAR_INT,VS_binary);
-
-        TWO_OP (ST_SCALAR_INT,ST_MATRIX,SM_binary);
-        TWO_OP (ST_SCALAR_INT,ST_VECTOR,SV_binary);
-        TWO_OP (ST_SCALAR_INT,ST_SCALAR_INT,SS_binary);      
-
-        TWO_OP (ST_SCALAR_FLT,ST_MATRIX,SM_binary);
-        TWO_OP (ST_SCALAR_FLT,ST_VECTOR,SV_binary);
-        TWO_OP (ST_SCALAR_FLT,ST_SCALAR_INT,SS_binary);      
+        TWO_OP (ST_VECTOR,ST_SCALAR_INT,VS_binary); // handles ST_SCALAR_INT and ST_SCALAR_FLT 
+
+        TWO_OP (ST_SCALAR_INT,ST_MATRIX,SM_binary); // handles ST_SCALAR_INT and ST_SCALAR_FLT 
+        TWO_OP (ST_SCALAR_INT,ST_VECTOR,SV_binary); // handles ST_SCALAR_INT and ST_SCALAR_FLT 
+        TWO_OP (ST_SCALAR_INT,ST_SCALAR_INT,SS_binary);       // handles ST_SCALAR_INT and ST_SCALAR_FLT 
+
+//      XXX: this block is not needed
+//      TWO_OP (ST_SCALAR_FLT,ST_MATRIX,SM_binary);
+//      TWO_OP (ST_SCALAR_FLT,ST_VECTOR,SV_binary);
+//      TWO_OP (ST_SCALAR_FLT,ST_SCALAR_INT,SS_binary);      
+
+        TWO_OP (ST_VECTOR,ST_STRING,LW_binary);      
+        TWO_OP (ST_STRING,ST_VECTOR,WL_binary);      
 
         TWO_OP (ST_STRING,ST_STRING,WW_binary);      
@@ -350 +359 @@
 }
 
+// strip off surrounding " and return newly allocated string
+char *clean_stack_name (char *name) {
+
+  if (!name) return name;
+
+  char *tmpname = name;
+  if (name[0] == '"') tmpname ++;
+
+  char *output = strcreate (tmpname);
+
+  int Nchar = strlen(output);
+  if (Nchar == 0) return output; // empty string
+
+  // squash ending quotes:
+  if (output[Nchar - 1] == '"') output[Nchar - 1] = 0;
+
+  return output;
+}
+
 void assign_stack (StackVar *stack, char *name, StackVarType type) {
-  stack->name = strcreate (name);
+  stack->name = strcreate(name);
   stack->type = type;
 }