Changeset 506 for trunk/thune/thune.c

Timestamp:

02/08/08 04:14:39 (10 months ago)

Author:

krobillard

Message:

Changed if/keep to if-some. Added or-else.

Files:

• trunk/thune/thune.c (modified) (6 diffs)

trunk/thune/thune.c

@@ -373 +373 @@
 #define EMH_HALT(pc,end)
 #endif
+
+
+inline int ur_isFalse( UCell* c )
+{
+    return ur_is(c, UT_NONE) || (ur_is(c, UT_LOGIC) && ! ur_logic(c));
+}
 
 
@@ -685 +691 @@
                     break;
 
-                case OP_IF_TRUE:       // (logic -- )
-                    val = UR_TOS;
-                    if( ur_is(val, UT_NONE) ||
-                        (ur_is(val, UT_LOGIC) && ! ur_logic(val)) )
+                case OP_IF_TRUE:        // (logic -- )
+if_true:
+                    if( ur_isFalse( UR_TOS ) )
                         goto if_skip;
                     UR_S_DROP;
                     break;
 
-                case OP_IF_FALSE:      // (logic -- )
-                    val = UR_TOS;
-                    if( ur_is(val, UT_NONE) ||
-                        (ur_is(val, UT_LOGIC) && ! ur_logic(val)) )
+                case OP_IF_SOME:        // (val -- [val])
+                    if( ur_isFalse( UR_TOS ) )
+                        goto if_skip;
+                    break;
+
+                case OP_IF_FALSE:       // (logic -- )
+                    if( ur_isFalse( UR_TOS ) )
                         goto if_do;
 if_skip:
@@ -705 +713 @@
                     break;
 
-                case OP_IF:            // (val val -- )
+                case OP_OR_ELSE:        // (val -- [val])
+                    if( ur_isFalse( UR_TOS ) )
+                        goto if_do;
+                    if( pc != end )
+                        ++pc;
+                    break;
+
+                case OP_IF:             // (val val -- )
                 {
                     int n;
@@ -716 +731 @@
                             goto if_skip;
 
-                        case UR_ATOM_GT:
-                            n = ur_greaterThan( UR_TOS, ur_s_next(UR_TOS) );
-                            break;
-
-                        case UR_ATOM_LT:
-                            n = ur_lessThan( UR_TOS, ur_s_next(UR_TOS) );
-                            break;
-
                         case UR_ATOM_NEQ:
                             if( ! ur_equal( ut, UR_TOS, ur_s_next(UR_TOS) ) )
@@ -729 +736 @@
                             goto if_skip;
 
+                        case UR_ATOM_GT:
+                            n = ur_greaterThan( UR_TOS, ur_s_next(UR_TOS) );
+                            break;
+
+                        case UR_ATOM_LT:
+                            n = ur_lessThan( UR_TOS, ur_s_next(UR_TOS) );
+                            break;
+
                         case UR_ATOM_GTE:
                             n = ur_greaterOrEqual( UR_TOS, ur_s_next(UR_TOS) );
@@ -737 +752 @@
                             break;
 
-                        case UR_ATOM_KEEP:  // (val -- [val])
-                            UR_S_GROW;
-                            val = UR_TOS;
-                            if( ur_is(val, UT_NONE) ||
-                                (ur_is(val, UT_LOGIC) && ! ur_logic(val)) )
-                                goto if_skip;
-                            goto execute;
-
                         //case UR_ATOM_ZERO:
                         //    break;
+
+                        default:
+                            goto if_true;
                     }
                     if( n == 1 )