Changeset 20860 for branches/eam_branch_20081124/Ohana/src/opihi/include/dvoshell.h

Timestamp:

Nov 30, 2008, 2:46:46 PM (18 years ago)

Author:

eugene

Message:

set vectors to use INT or FLT types as needed; cleanup type information in dbStack (use enum)

File:

• branches/eam_branch_20081124/Ohana/src/opihi/include/dvoshell.h (modified) (5 diffs)

branches/eam_branch_20081124/Ohana/src/opihi/include/dvoshell.h

@@ -5 +5 @@
 # ifndef DVOSHELL_H
 # define DVOSHELL_H
+
+typedef enum {
+  DB_STACK_NONE  = 0,
+  DB_STACK_INT   = 0x01,
+  DB_STACK_FIELD = 0x02,
+  DB_STACK_TEMP  = 0x04,
+  DB_STACK_VALUE = 0x08,
+  DB_STACK_CLOSE_PAR = 0x10,
+  DB_STACK_OPEN_PAR,
+  DB_STACK_LOGIC,
+  DB_STACK_COMPARE,
+  DB_STACK_BITWISE,
+  DB_STACK_SUM,
+  DB_STACK_MULTIPLY,
+  DB_STACK_POWER,
+  DB_STACK_UNARY,
+} dbStackTypes;
 
 /* magnitude types */
@@ -145 +162 @@
   char    type;
   int     field;
-  float   Float;
+  opihi_flt FltValue;
+  opihi_int IntValue;
 } dbStack;
 
@@ -234 +252 @@
 dbStack     *dbRPN                  PROTO((int argc, char **argv, int *nstack));
 int          dbCheckStack           PROTO((dbStack *stack, int Nstack, int table, dbField **inFields, int *Nfields));
-int          dbBooleanCond          PROTO((dbStack *inStack, int NinStack, float *fields));
+int          dbBooleanCond          PROTO((dbStack *inStack, int NinStack, dbValue *fields));
 void         dbInitStack            PROTO((dbStack *stack));
 void         dbFreeStack            PROTO((dbStack *stack, int Nstack));
@@ -240 +258 @@
 void         dbFreeTempEntry        PROTO((dbStack *stack));
 
-dbStack     *dbBinary               PROTO((dbStack *V1, dbStack *V2, char *op, float *fields));
-dbStack     *dbUnary                PROTO((dbStack *V1, char *op, float *fields));
+dbStack     *dbBinary               PROTO((dbStack *V1, dbStack *V2, char *op, dbValue *fields));
+dbStack     *dbUnary                PROTO((dbStack *V1, char *op, dbValue *fields));
 
 int          GetMagMode             PROTO((char *string));
@@ -248 +266 @@
 int          ParseAverageField      PROTO((dbField *field, char *fieldName));
 
-double       dbExtractAverages      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
-double       dbExtractMeasures      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
+dbValue      dbExtractAverages      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
+dbValue      dbExtractMeasures      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
 void         dbExtractMeasuresInit  PROTO(());