Changeset 506

Timestamp:

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

Author:

krobillard

Message:

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

Location:

trunk/thune

Files:

• boot.c (modified) (3 diffs)
• doc/UserManual (modified) (1 diff)
• gl/gx_atoms.h (modified) (1 diff)
• internal.h (modified) (1 diff)
• mkboot.t (modified) (3 diffs)
• rune/mkboot.t (modified) (1 diff)
• scripts/obj_to_gx.t (modified) (2 diffs)
• thune.c (modified) (6 diffs)

trunk/thune/boot.c

@@ -24 +24 @@
   "  opcode! 19 'try     make :try\n"
   "  opcode! 20 'ift     make :ift\n"
-  "  opcode! 21 'iff     make :iff\n"
-  "  opcode! 22 'if      make :if\n"
-  "  opcode! 23 'halt    make :halt\n"
-  "  opcode! 24 'quit    make :quit\n"
-  "  opcode! 25 'inc     make :inc\n"
-  "  opcode! 26 'dec     make :dec\n"
-  "  opcode! 27 '++      make :++\n"
-  "  opcode! 28 '--      make :--\n"
-  "  opcode! 29 'verify  make :verify\n"
-  "  opcode! 30 'forever make :forever\n"
+  "  opcode! 21 'if-some make :if-some\n"
+  "  opcode! 22 'iff     make :iff\n"
+  "  opcode! 23 'or-else make :or-else\n"
+  "  opcode! 24 'if      make :if\n"
+  "  opcode! 25 'halt    make :halt\n"
+  "  opcode! 26 'quit    make :quit\n"
+  "  opcode! 27 'inc     make :inc\n"
+  "  opcode! 28 'dec     make :dec\n"
+  "  opcode! 29 '++      make :++\n"
+  "  opcode! 30 '--      make :--\n"
+  "  opcode! 31 'verify  make :verify\n"
+  "  opcode! 32 'forever make :forever\n"
   "  int!/decimal! :number!\n"
   "  word!/set-word!/get-word!/lit-word! :any-word!\n"
@@ -56 +58 @@
   "  to-block kernel-ops infuse\n"
   "] proc :load    ;(filename -- block)\n"
-  "[select if/keep do] proc :case\n"
+  "[select if-some do] proc :case\n"
   "['break throw] proc :break\n"
   "[\n"
@@ -90 +92 @@
   "[ser old new | len] [\n"
   "    old length? :len\n"
-  "    ser old find if/keep (new len change :ser recurse)\n"
+  "    ser old find if-some (new len change :ser recurse)\n"
   "    ser\n"
   "] func :replace.all     ;(ser old new -- ser)\n"

trunk/thune/doc/UserManual

@@ -360 +360 @@
 iff       (logic -- )                Evaluate next value if false.
 if/C      (val val -- )              Evaluate next value if comparison is true.
-if/keep   (val -- [val])             Evaluate next value if true, else drop.
+if-some   (val -- [val])             Evaluate next value if true, else drop.
+or-else   (val -- [val])             Keep true value, or drop and evaluate next.
 either    (logic t-val f-val -- )    Evaluate either t-val or f-val.
 forever   (block -- )                Evaluate block until exception thrown.

trunk/thune/gl/gx_atoms.h

@@ -1 +1 @@
 // This file is automatically generated - do not edit.
 
-#define UR_ATOM_DRAW_LIST_OPCODES               324
-#define UR_ATOM_WIDTH           325
-#define UR_ATOM_HEIGHT          326
-#define UR_ATOM_AREA            327
-#define UR_ATOM_RECT            328
-#define UR_ATOM_RASTER          329
-#define UR_ATOM_TEXTURE         330
-#define UR_ATOM_ELEM            331
+#define UR_ATOM_DRAW_LIST_OPCODES               326
+#define UR_ATOM_WIDTH           327
+#define UR_ATOM_HEIGHT          328
+#define UR_ATOM_AREA            329
+#define UR_ATOM_RECT            330
+#define UR_ATOM_RASTER          331
+#define UR_ATOM_TEXTURE         332
+#define UR_ATOM_ELEM            333
 #define UR_ATOM_CLOSE           184
-#define UR_ATOM_FOCUS           332
-#define UR_ATOM_RESIZE          333
-#define UR_ATOM_KEY_DOWN                334
-#define UR_ATOM_KEY_UP          335
-#define UR_ATOM_MOUSE_MOVE              336
-#define UR_ATOM_MOUSE_UP                337
-#define UR_ATOM_MOUSE_DOWN              338
-#define UR_ATOM_MOUSE_WHEEL             339
-#define UR_ATOM_AMBIENT         340
-#define UR_ATOM_DIFFUSE         341
-#define UR_ATOM_SPECULAR                342
-#define UR_ATOM_POS             343
-#define UR_ATOM_SHADER          344
-#define UR_ATOM_VERTEX          345
-#define UR_ATOM_FRAGMENT                346
-#define UR_ATOM_DEFAULT         347
+#define UR_ATOM_FOCUS           334
+#define UR_ATOM_RESIZE          335
+#define UR_ATOM_KEY_DOWN                336
+#define UR_ATOM_KEY_UP          337
+#define UR_ATOM_MOUSE_MOVE              338
+#define UR_ATOM_MOUSE_UP                339
+#define UR_ATOM_MOUSE_DOWN              340
+#define UR_ATOM_MOUSE_WHEEL             341
+#define UR_ATOM_AMBIENT         342
+#define UR_ATOM_DIFFUSE         343
+#define UR_ATOM_SPECULAR                344
+#define UR_ATOM_POS             345
+#define UR_ATOM_SHADER          346
+#define UR_ATOM_VERTEX          347
+#define UR_ATOM_FRAGMENT                348
+#define UR_ATOM_DEFAULT         349
 #define UR_ATOM_WAIT            135
-#define UR_ATOM_RGB             348
-#define UR_ATOM_RGBA            349
-#define UR_ATOM_DEPTH           350
-#define UR_ATOM_CLAMP           351
-#define UR_ATOM_REPEAT          352
-#define UR_ATOM_NEAREST         353
-#define UR_ATOM_LINEAR          354
-#define UR_ATOM_MIN             355
-#define UR_ATOM_MAG             356
-#define UR_ATOM_MIPMAP          357
-#define UR_ATOM_GRAY            358
-#define UR_ATOM_RGB             348
-#define UR_ATOM_RGBA            349
-#define UR_ATOM_ON              265
-#define UR_ATOM_OFF             267
+#define UR_ATOM_RGB             350
+#define UR_ATOM_RGBA            351
+#define UR_ATOM_DEPTH           352
+#define UR_ATOM_CLAMP           353
+#define UR_ATOM_REPEAT          354
+#define UR_ATOM_NEAREST         355
+#define UR_ATOM_LINEAR          356
+#define UR_ATOM_MIN             357
+#define UR_ATOM_MAG             358
+#define UR_ATOM_MIPMAP          359
+#define UR_ATOM_GRAY            360
+#define UR_ATOM_RGB             350
+#define UR_ATOM_RGBA            351
+#define UR_ATOM_ON              267
+#define UR_ATOM_OFF             269
 #define UR_ATOM_ADD             203
-#define UR_ATOM_BURN            359
-#define UR_ATOM_COLOR           360
-#define UR_ATOM_TRANS           361
-#define UR_ATOM_SPRITE          362
-#define UR_ATOM_ONCE            363
-#define UR_ATOM_PING_PONG               364
-#define UR_ATOM_PONG            365
+#define UR_ATOM_BURN            361
+#define UR_ATOM_COLOR           362
+#define UR_ATOM_TRANS           363
+#define UR_ATOM_SPRITE          364
+#define UR_ATOM_ONCE            365
+#define UR_ATOM_PING_PONG               366
+#define UR_ATOM_PONG            367

trunk/thune/internal.h

@@ -198 +198 @@
 #define OP_TRY              19
 #define OP_IF_TRUE          20
-#define OP_IF_FALSE         21
-#define OP_IF               22
-#define OP_HALT             23
-#define OP_QUIT             24
-#define OP_INCREMENT        25
-#define OP_DECREMENT        26
-#define OP_INC_WORD         27
-#define OP_DEC_WORD         28
-#define OP_VERIFY           29
-#define OP_FOREVER          30
-#define OP_REDUCE           31
-#define OP_DO_FUNC          32
+#define OP_IF_SOME          21
+#define OP_IF_FALSE         22
+#define OP_OR_ELSE          23
+#define OP_IF               24
+#define OP_HALT             25
+#define OP_QUIT             26
+#define OP_INCREMENT        27
+#define OP_DECREMENT        28
+#define OP_INC_WORD         29
+#define OP_DEC_WORD         30
+#define OP_VERIFY           31
+#define OP_FOREVER          32
+#define OP_REDUCE           33
+#define OP_DO_FUNC          34
 //#define OP_END              255
 

trunk/thune/mkboot.t

@@ -25 +25 @@
   opcode! 19 'try     make :try
   opcode! 20 'ift     make :ift
-  opcode! 21 'iff     make :iff
-  opcode! 22 'if      make :if
-  opcode! 23 'halt    make :halt
-  opcode! 24 'quit    make :quit
-  opcode! 25 'inc     make :inc
-  opcode! 26 'dec     make :dec
-  opcode! 27 '++      make :++
-  opcode! 28 '--      make :--
-  opcode! 29 'verify  make :verify
-  opcode! 30 'forever make :forever
+  opcode! 21 'if-some make :if-some
+  opcode! 22 'iff     make :iff
+  opcode! 23 'or-else make :or-else
+  opcode! 24 'if      make :if
+  opcode! 25 'halt    make :halt
+  opcode! 26 'quit    make :quit
+  opcode! 27 'inc     make :inc
+  opcode! 28 'dec     make :dec
+  opcode! 29 '++      make :++
+  opcode! 30 '--      make :--
+  opcode! 31 'verify  make :verify
+  opcode! 32 'forever make :forever
 
   int!/decimal! :number!
@@ -61 +63 @@
 ] proc :load    ;(filename -- block)
 
-[select if/keep do] proc :case
+[select if-some do] proc :case
 
 ['break throw] proc :break
@@ -104 +106 @@
 [ser old new | len] [
     old length? :len
-    ser old find if/keep (new len change :ser recurse)
+    ser old find if-some (new len change :ser recurse)
     ser
 ] func :replace.all     ;(ser old new -- ser)

trunk/thune/rune/mkboot.t

@@ -122 +122 @@
 ]
 
-;case func [blk] [select blk if/keep do]
+;case func [blk] [select blk if-some do]
 
 break: does [throw 'break]

trunk/thune/scripts/obj_to_gx.t

@@ -97 +97 @@
     )
 
-    geo/surfs if/keep write-surf
+    geo/surfs if-some write-surf
     ;"  color 0.8,0.8,0.8" print
 
@@ -232 +232 @@
         | "usemtl" cl (data trim mtllib select :geo/surfs)
         | "g"  sl
-        | "o"  cl (geo if/keep write-geo
+        | "o"  cl (geo if-some write-geo
                    gx-geom [
                      data trim copy :name

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 )