Changeset 44 for trunk/orca/ovalue.c

Timestamp:

02/12/06 15:46:49 (3 years ago)

Author:

krobillard

Message:

Added orIfTrue/orIfFalse macros.

Files:

• trunk/orca/ovalue.c (modified) (2 diffs)

trunk/orca/ovalue.c

@@ -1488 +1488 @@
 void orIfNative( OValue* a1 )
 {
-    if( a1->type != OT_NONE )
-    {
-        if( (a1->type != OT_LOGIC) || (a1->integer != 0)  )
-        {
-            OValue* a2 = a1 + 1;
-            orEvalBlock( orBLOCK( a2 ), a2->series.it );
-            return;
-        }
+    if( orIfTrue(a1) )
+    {
+        OValue* a2 = a1 + 1;
+        orEvalBlock( orBLOCK( a2 ), a2->series.it );
+        return;
     }
     orResultNONE;
@@ -1503 +1500 @@
 void orUnlessNative( OValue* a1 )
 {
-    if( (a1->type == OT_NONE) ||
-        ((a1->type == OT_LOGIC) && (a1->integer == 0)) )
+    if( orIfFalse(a1) )
     {
         OValue* a2 = a1 + 1;