Changeset 20936 for trunk/Ohana/src/opihi/dvo/dbBooleanCond.c

Timestamp:

Dec 7, 2008, 3:31:01 PM (18 years ago)

Author:

eugene

Message:

big update from eam_branch_20081124 with updates to Opihi math

File:

• trunk/Ohana/src/opihi/dvo/dbBooleanCond.c (modified) (4 diffs)

trunk/Ohana/src/opihi/dvo/dbBooleanCond.c

@@ -3 +3 @@
 // evaluate the expression in inStack as a boolean; necessary db field values are
 // supplied by fields, in order 0 - Nfields (validate before calling)
-int dbBooleanCond (dbStack *inStack, int NinStack, float *fields) {
+// XXX fields needs to be typed (dbValue), stack math needs to deal with the type cases
+int dbBooleanCond (dbStack *inStack, int NinStack, dbValue *fields) {
   
   float value;
@@ -21 +22 @@
 
     /***** binary operators *****/
-    if ((stack[i][0].type >= 3) && (stack[i][0].type <= 8)) {
+    if ((stack[i][0].type >= DB_STACK_LOGIC) && (stack[i][0].type <= DB_STACK_POWER)) {
 
       // pre-test that op and entries match
@@ -41 +42 @@
 
     /***** unary operators **/
-    if (stack[i][0].type == 9) {
+    if (stack[i][0].type == DB_STACK_UNARY) {
 
       // pre-test that op and entries match
@@ -61 +62 @@
 
   // the result here is a single stack entry with a value:
-  if (stack[0][0].type == 'F') {
+  if (stack[0][0].type & DB_STACK_FIELD) {
     N = stack[0][0].field;
-    value = fields[N];
+    value = (stack[0][0].type & DB_STACK_INT) ? fields[N].Int : fields[N].Flt;
   } else {
-    value = stack[0][0].Float;
+    value = (stack[0][0].type & DB_STACK_INT) ? stack[0][0].IntValue : stack[0][0].FltValue;
   }