Changeset 44

Timestamp:

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

Author:

krobillard

Message:

Added orIfTrue/orIfFalse macros.

Location:

trunk/orca

Files:

• ovalue.c (modified) (2 diffs)
• ovalue.h (modified) (2 diffs)
• tests/run_test (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;

trunk/orca/ovalue.h

@@ -486 +486 @@
 #define orType(val)     (val)->type
 #define orInteger(val)  (val)->integer
+#define orLogic(val)    (val)->integer
 #define orDecimal(val)  (val)->num.decimal
 #define orTupleLen(val) (val)->argc
@@ -494 +495 @@
 #define orIsBlock(t)    ((t >= OT_BLOCK) && (t < OT_SETPATH))
 #define orIsNumber(t)   ((t == OT_INTEGER) || (t == OT_DECIMAL))
+
+#define orIfTrue(val) \
+    ((orType(val) != OT_NONE) && \
+     ((orType(val) != OT_LOGIC) || (orLogic(val) != 0)))
+
+#define orIfFalse(val) \
+    (orIs(val, OT_NONE) || (orIs(val, OT_LOGIC) && (orLogic(val) == 0)))
 
 #define orRefAvail(n) \

trunk/orca/tests/run_test

@@ -2 +2 @@
 
 INTERPRETER=../orca
-#INTERPRETER=../rsharp
+REBOL=rebol
+#REBOL=./rebol
 
 #DIFF='diff -w --ignore-blank-lines'
@@ -13 +14 @@
         ROUT=${FILE%.*}.outr 
         OUT=${FILE%.*}.out
-        rebol -qs $FILE >$ROUT
+        $REBOL -qs $FILE >$ROUT
         $INTERPRETER $FILE >$OUT
         ${DIFF} $OUT $ROUT