Changeset 36151 for branches/eam_branches/ipp-20130904/Ohana/src/opihi/include/dvomath.h

Timestamp:

Sep 24, 2013, 12:18:50 PM (13 years ago)

Author:

eugene

Message:

change stack.type to an enum with sensible names; add support for binary functions of the form a(x,y); add support for the trinary operator a ? b : c (does not yet support sufficiently flexible cases for the types of a, b, c)

File:

• branches/eam_branches/ipp-20130904/Ohana/src/opihi/include/dvomath.h (modified) (2 diffs)

branches/eam_branches/ipp-20130904/Ohana/src/opihi/include/dvomath.h

@@ -55 +55 @@
 } Buffer;
 
+typedef enum {
+  ST_NONE,
+  ST_LEFT,
+  ST_RIGHT,
+  ST_COMMA,
+  ST_TRINARY,
+  ST_OR,
+  ST_AND,
+  ST_LOGIC,
+  ST_BITWISE,
+  ST_ADD,
+  ST_TIMES,
+  ST_POWER,
+  ST_UNARY,
+  ST_BINARY,
+
+  ST_VALUE,
+  ST_SCALAR_INT,
+  ST_SCALAR_FLT,
+  ST_VECTOR,
+  ST_VECTOR_TMP,
+  ST_MATRIX,
+  ST_MATRIX_TMP,
+
+  ST_STRING,
+  ST_STRING_TMP,
+} StackVarType;
+
 typedef struct {                        /* math stack structure */
   char   *name;
-  char    type;
+  StackVarType type;
   Buffer *buffer;
   Vector *vector;
@@ -77 +105 @@
 void          delete_stack          PROTO((StackVar *stack, int Nstack));
 void          clear_stack           PROTO((StackVar *stack));
-void          assign_stack          PROTO((StackVar *stack, char *name, int type));
+void          assign_stack          PROTO((StackVar *stack, char *name, StackVarType type));
+
+int           SSS_trinary           PROTO((StackVar *OUT, StackVar *V1, StackVar *V2, StackVar *V3, char *op));
+int           VVV_trinary           PROTO((StackVar *OUT, StackVar *V1, StackVar *V2, StackVar *V3, char *op));
+int           MMM_trinary           PROTO((StackVar *OUT, StackVar *V1, StackVar *V2, StackVar *V3, char *op));
 
 int           VV_binary             PROTO((StackVar *OUT, StackVar *V1, StackVar *V2, char *op));