case/cond

diff --git a/extra/project-euler/169/169.factor b/extra/project-euler/169/169.factor
index 90655149dc48b2e0dc1075f37ca4d0abb7b0b691..973e50748c0f79bb7e1b1e3b833443ca83a2f39b 100644 (file)
--- a/extra/project-euler/169/169.factor
+++ b/extra/project-euler/169/169.factor
@@ -30,7 +30,7 @@ MEMO: fn ( n -- x )
     {
         { [ dup 2 < ]  [ drop 1 ] }
         { [ dup odd? ] [ 2/ fn ] }
-        { [ t ]        [ 2/ [ fn ] [ 1- fn + ] bi + ] }
+        [ 2/ [ fn ] [ 1- fn + ] bi + ]
     } cond ;
 
 : euler169 ( -- result )

diff --git a/extra/project-euler/175/175.factor b/extra/project-euler/175/175.factor
index e6b4acc8c080f2a476318542dbb7f1fd153eeffd..853bf9a10f1b7c28841ee68da0ea9579cd52b3cb 100644 (file)
--- a/extra/project-euler/175/175.factor
+++ b/extra/project-euler/175/175.factor
@@ -44,7 +44,7 @@ IN: project-euler.175
     {
         { [ dup integer? ] [ 1- 0 add-bits ] }
         { [ dup 1 < ] [ 1 over - / dupd compute 1 1 add-bits ] }
-        { [ t ] [ [ 1 mod compute ] 2keep >integer 0 add-bits ] }
+        [ [ 1 mod compute ] 2keep >integer 0 add-bits ]
     } cond ;
 
 PRIVATE>

diff --git a/extra/reports/noise/noise.factor b/extra/reports/noise/noise.factor
index 6921d1223ab162d03985ec8fb1b010dad095f4f5..c3b7311714eaa33079ff9d79543610d5e87b8c9c 100755 (executable)
--- a/extra/reports/noise/noise.factor
+++ b/extra/reports/noise/noise.factor
@@ -113,7 +113,7 @@ M: array noise [ noise ] map vsum ;
     noise first2 {\r
         { [ over 4 <= ] [ >r drop 0 r> ] }\r
         { [ over 15 >= ] [ >r 2 * r> ] }\r
-        { [ t ] [ ] }\r
+        [ ]\r
     } cond\r
     {\r
         ! short words are easier to read\r
@@ -123,7 +123,7 @@ M: array noise [ noise ] map vsum ;
         { [ dup 25 >= ] [ >r 2 * r> 20 max ] }\r
         { [ dup 20 >= ] [ >r 5/3 * r> ] }\r
         { [ dup 15 >= ] [ >r 3/2 * r> ] }\r
-        { [ t ] [ ] }\r
+        [ ]\r
     } cond noise-factor ;\r
 \r
 GENERIC: word-noise-factor ( word -- factor )\r

diff --git a/extra/rot13/rot13.factor b/extra/rot13/rot13.factor
index bf5105f334647ad6b48d4ced966532bcb59cd767..6663381522aeb2fbcde56cd4f2b526184c1cd0f7 100644 (file)
--- a/extra/rot13/rot13.factor
+++ b/extra/rot13/rot13.factor
@@ -9,7 +9,7 @@ IN: rot13
     {
         { [ dup letter? ] [ CHAR: a rotate ] }
         { [ dup LETTER? ] [ CHAR: A rotate ] }
-        { [ t ] [ ] }
+        [ ]
     } cond ;
 
 : rot13 ( string -- string ) [ rot-letter ] map ;

diff --git a/extra/serialize/serialize.factor b/extra/serialize/serialize.factor
index 7a2fbfae9e6c4a93d650a585e095d39362d00d69..280ce3b43ed98e632610714a5bad3b7979f98aec 100755 (executable)
--- a/extra/serialize/serialize.factor
+++ b/extra/serialize/serialize.factor
@@ -65,7 +65,7 @@ GENERIC: (serialize) ( obj -- )
     read1 {
         { [ dup HEX: ff = ] [ drop deserialize-cell read be> ] }
         { [ dup HEX: 80 >= ] [ HEX: 80 bitxor ] }
-        { [ t ] [ read be> ] }
+        [ read be> ]
     } cond ;
 
 : serialize-shared ( obj quot -- )
@@ -183,7 +183,7 @@ M: word (serialize) ( obj -- )
     {
         { [ dup t eq? ] [ serialize-true ] }
         { [ dup word-vocabulary not ] [ serialize-gensym ] }
-        { [ t ] [ serialize-word ] }
+        [ serialize-word ]
     } cond ;
 
 M: wrapper (serialize) ( obj -- )

diff --git a/extra/smtp/server/server.factor b/extra/smtp/server/server.factor
index 14957ceca2e4fe8589dfe6bc851c996a9b9a0bf3..f3db1cdf0988ba4037120655fe67ca67e3519a3b 100755 (executable)
--- a/extra/smtp/server/server.factor
+++ b/extra/smtp/server/server.factor
@@ -56,9 +56,9 @@ SYMBOL: data-mode
             "220 OK\r\n" write flush t
           ] }
         { [ data-mode get ] [ dup global [ print ] bind t ] }
-        { [ t ] [ 
+        [ 
             "500 ERROR\r\n" write flush t
-          ] }
+        ]
     } cond nip [ process ] when ;
 
 : mock-smtp-server ( port -- )

diff --git a/extra/smtp/smtp.factor b/extra/smtp/smtp.factor
index ee2b021329f20e393da26a90b8469f48958a3327..844857d1db5911f431dc8d0b2a6a04800c919929 100755 (executable)
--- a/extra/smtp/smtp.factor
+++ b/extra/smtp/smtp.factor
@@ -70,7 +70,7 @@ LOG: smtp-response DEBUG
         { [ dup "50" head? ] [ smtp-response "syntax error" throw ] }
         { [ dup "53" head? ] [ smtp-response "invalid authentication data" throw ] }
         { [ dup "55" head? ] [ smtp-response "fatal error" throw ] }
-        { [ t ] [ "unknown error" throw ] }
+        [ "unknown error" throw ]
     } cond ;
 
 : multiline? ( response -- boolean )

diff --git a/extra/space-invaders/space-invaders.factor b/extra/space-invaders/space-invaders.factor
index d66ffdc66e075d95739160857d73fa32d4c0e2e0..200257b31c53ef442a1aa502be553ca3191288e4 100755 (executable)
--- a/extra/space-invaders/space-invaders.factor
+++ b/extra/space-invaders/space-invaders.factor
@@ -306,7 +306,7 @@ M: invaders-gadget draw-gadget* ( gadget -- )
     { [ dup 184 238 within pick 0 223 within and ] [ 2drop green ] }
     { [ dup 240 247 within pick 16 133 within and ] [ 2drop green ] }
     { [ dup 247 215 - 247 184 - within pick 0 223 within and ] [ 2drop red ] }
-    { [ t ] [ 2drop white ] }
+    [ 2drop white ]
   } cond ;
 
 : plot-bitmap-bits ( bitmap point byte bit -- )

diff --git a/extra/sudoku/sudoku.factor b/extra/sudoku/sudoku.factor
index 764c4d92f0271f0d3e1ffa0b25026fddee79347e..b0ba85c97f55dea438a78ea3d4445947e298a720 100644 (file)
--- a/extra/sudoku/sudoku.factor
+++ b/extra/sudoku/sudoku.factor
@@ -32,7 +32,7 @@ DEFER: search
         { [ 3dup nip row-contains? ] [ 3drop ] }
         { [ 3dup drop col-contains? ] [ 3drop ] }
         { [ 3dup box-contains? ] [ 3drop ] }
-        { [ t ] [ assume ] }
+        [ assume ]
     } cond ;
 
 : solve ( x y -- ) 9 [ 1+ 2over attempt ] each 2drop ;
@@ -62,7 +62,7 @@ DEFER: search
         { [ over 9 = ] [ >r drop 0 r> 1+ search ] }
         { [ over 0 = over 9 = and ] [ 2drop solution. ] }
         { [ 2dup board> ] [ >r 1+ r> search ] }
-        { [ t ] [ solve ] }
+        [ solve ]
     } cond ;
 
 : sudoku ( board -- )

diff --git a/extra/tools/completion/completion.factor b/extra/tools/completion/completion.factor
index 16bde2100f059fe693eee31bf653e0a98ab7784a..b9c37c065661ad65c10d4b360886809109078851 100755 (executable)
--- a/extra/tools/completion/completion.factor
+++ b/extra/tools/completion/completion.factor
@@ -35,7 +35,7 @@ unicode.categories ;
         { [ 2dup length 1- number= ] [ 2drop 4 ] }
         { [ 2dup >r 1- r> nth Letter? not ] [ 2drop 10 ] }
         { [ 2dup >r 1+ r> nth Letter? not ] [ 2drop 4 ] }
-        { [ t ] [ 2drop 1 ] }
+        [ 2drop 1 ]
     } cond ;
 
 : score ( full fuzzy -- n )

diff --git a/extra/tools/vocabs/browser/browser.factor b/extra/tools/vocabs/browser/browser.factor
index 6ecb0bc5ad67d1fa7ee761bbbc485456f6e625da..db1edbeb61bea21d4d706c7dc1eb02a56c1e9196 100755 (executable)
--- a/extra/tools/vocabs/browser/browser.factor
+++ b/extra/tools/vocabs/browser/browser.factor
@@ -10,7 +10,7 @@ IN: tools.vocabs.browser
     {
         { [ dup not ] [ drop "" ] }
         { [ dup vocab-main ] [ drop "[Runnable]" ] }
-        { [ t ] [ drop "[Loaded]" ] }
+        [ drop "[Loaded]" ]
     } cond ;
 
 : write-status ( vocab -- )

diff --git a/extra/tools/vocabs/vocabs.factor b/extra/tools/vocabs/vocabs.factor
index 825d2a63292977c0242b0039c8e05f7109d4f6ad..0630f857d54ce4d3c362dbf258c1f90e3d47bb02 100755 (executable)
--- a/extra/tools/vocabs/vocabs.factor
+++ b/extra/tools/vocabs/vocabs.factor
@@ -216,7 +216,7 @@ MEMO: all-vocabs-seq ( -- seq )
         { [ ".test" ?tail ] [ t ] }\r
         { [ "raptor" ?head ] [ t ] }\r
         { [ dup "tools.deploy.app" = ] [ t ] }\r
-        { [ t ] [ f ] }\r
+        [ f ]\r
     } cond nip ;\r
 \r
 : filter-dangerous ( seq -- seq' )\r

diff --git a/extra/tools/walker/walker.factor b/extra/tools/walker/walker.factor
index 4d1a4da6b13194870856240ac82a156db2f06863..4f8da77ddf007caf8071a8e27f7c26fa92c17df7 100755 (executable)
--- a/extra/tools/walker/walker.factor
+++ b/extra/tools/walker/walker.factor
@@ -73,7 +73,7 @@ M: object add-breakpoint ;
         { [ dup "step-into" word-prop ] [ "step-into" word-prop call ] }
         { [ dup standard-generic? ] [ effective-method (step-into-execute) ] }
         { [ dup primitive? ] [ execute break ] }
-        { [ t ] [ word-def (step-into-quot) ] }
+        [ word-def (step-into-quot) ]
     } cond ;
 
 \ (step-into-execute) t "step-into?" set-word-prop
@@ -153,7 +153,7 @@ SYMBOL: +stopped+
                 { [ dup quotation? ] [ add-breakpoint , \ break , ] }
                 { [ dup array? ] [ add-breakpoint , \ break , ] }
                 { [ dup word? ] [ literalize , \ (step-into-execute) , ] }
-                { [ t ] [ , \ break , ] }
+                [ , \ break , ]
             } cond %
         ] [ ] make
     ] change-frame ;

diff --git a/extra/trees/avl/avl.factor b/extra/trees/avl/avl.factor
index 81628684bc0349fd8f7514ea741f324f9e747cd3..2fa3efcf7bf440a201777c1898bdd55b4479c7a7 100755 (executable)
--- a/extra/trees/avl/avl.factor
+++ b/extra/trees/avl/avl.factor
@@ -29,7 +29,7 @@ TUPLE: avl-node balance ;
     avl-node-balance {
         { [ dup zero? ] [ 2drop 0 0 ] }
         { [ over = ] [ neg 0 ] }
-        { [ t ] [ 0 swap ] }
+        [ 0 swap ]
     } cond ;
 
 : double-rotate ( node -- node )
@@ -89,7 +89,7 @@ M: avl set-at ( value key node -- node )
     current-side get over avl-node-balance {
         { [ dup zero? ] [ drop neg over set-avl-node-balance f ] }
         { [ dupd = ] [ drop 0 over set-avl-node-balance t ] }
-        { [ t ] [ dupd neg change-balance rebalance-delete ] }
+        [ dupd neg change-balance rebalance-delete ]
     } cond ;
 
 : avl-replace-with-extremity ( to-replace node -- node shorter? )

diff --git a/extra/trees/trees.factor b/extra/trees/trees.factor
index e59bbab1ed69aa5694e1cad1df54b0ee97f65e94..1648eeec3242d0818fcf8e62beb8fbdf11c81d1a 100755 (executable)
--- a/extra/trees/trees.factor
+++ b/extra/trees/trees.factor
@@ -112,7 +112,7 @@ M: tree set-at ( value key tree -- )
           [ 2drop t ] }
         { [ >r 2nip r> [ tree-call ] 2keep rot ]
           [ drop [ node-key ] keep node-value t ] }
-        { [ t ] [ >r node-right r> find-node ] }
+        [ >r node-right r> find-node ]
     } cond ; inline
 
 M: tree-mixin assoc-find ( tree quot -- key value ? )

diff --git a/extra/unix/stat/stat.factor b/extra/unix/stat/stat.factor
index 342047d9aff7defe329b00e649e230729362e0cb..cb1c93987888ef86fb8be22d9141fb890a219c1c 100644 (file)
--- a/extra/unix/stat/stat.factor
+++ b/extra/unix/stat/stat.factor
@@ -10,23 +10,13 @@ IN: unix.stat
 
 : S_IFMT   OCT: 170000 ; ! These bits determine file type.
 
-: S_IFDIR  OCT:  40000 ;    ! Directory.
-: S_IFCHR  OCT:  20000 ;    ! Character device.
-: S_IFBLK  OCT:  60000 ;    ! Block device.
-: S_IFREG  OCT: 100000 ;    ! Regular file.
-: S_IFIFO  OCT: 010000 ;    ! FIFO.
-: S_IFLNK  OCT: 120000 ;    ! Symbolic link.
-: S_IFSOCK OCT: 140000 ;    ! Socket.
-
-: S_ISTYPE ( mode mask -- val ) >r S_IFMT bitand r> = ;
-
-: S_ISREG  ( mode -- value ) S_IFREG S_ISTYPE ;
-: S_ISDIR  ( mode -- value ) S_IFDIR S_ISTYPE ;
-: S_ISCHR  ( mode -- value ) S_IFCHR S_ISTYPE ;
-: S_ISBLK  ( mode -- value ) S_IFBLK S_ISTYPE ;
-: S_ISFIFO ( mode -- value ) S_IFIFO S_ISTYPE ;
-: S_ISLNK  ( mode -- value ) S_IFLNK S_ISTYPE ;
-: S_ISSOCK ( mode -- value ) S_IFSOCK S_ISTYPE ;
+: S_IFDIR  OCT:  40000 ; inline   ! Directory.
+: S_IFCHR  OCT:  20000 ; inline   ! Character device.
+: S_IFBLK  OCT:  60000 ; inline   ! Block device.
+: S_IFREG  OCT: 100000 ; inline   ! Regular file.
+: S_IFIFO  OCT: 010000 ; inline   ! FIFO.
+: S_IFLNK  OCT: 120000 ; inline   ! Symbolic link.
+: S_IFSOCK OCT: 140000 ; inline   ! Socket.
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! File Access Permissions

diff --git a/extra/x11/events/events.factor b/extra/x11/events/events.factor
index f40392891c5b8bb885d1af1a582614e2202624a1..af496923946b232b18c06443615ed470c019a2a2 100644 (file)
--- a/extra/x11/events/events.factor
+++ b/extra/x11/events/events.factor
@@ -52,22 +52,22 @@ GENERIC: client-event ( event window -- )
 
 : handle-event ( event window -- )
     over XAnyEvent-type {
-        { [ dup Expose = ] [ drop expose-event ] }
-        { [ dup ConfigureNotify = ] [ drop configure-event ] }
-        { [ dup ButtonPress = ] [ drop button-down-event$ ] }
-        { [ dup ButtonRelease = ] [ drop button-up-event$ ] }
-        { [ dup EnterNotify = ] [ drop enter-event ] }
-        { [ dup LeaveNotify = ] [ drop leave-event ] }
-        { [ dup MotionNotify = ] [ drop motion-event ] }
-        { [ dup KeyPress = ] [ drop key-down-event ] }
-        { [ dup KeyRelease = ] [ drop key-up-event ] }
-        { [ dup FocusIn = ] [ drop focus-in-event ] }
-        { [ dup FocusOut = ] [ drop focus-out-event ] }
-        { [ dup SelectionNotify = ] [ drop selection-notify-event ] }
-        { [ dup SelectionRequest = ] [ drop selection-request-event ] }
-        { [ dup ClientMessage = ] [ drop client-event ] }
-        { [ t ] [ 3drop ] }
-    } cond ;
+        { \ Expose [ expose-event ] }
+        { \ ConfigureNotify [ configure-event ] }
+        { \ ButtonPress [ button-down-event$ ] }
+        { \ ButtonRelease [ button-up-event$ ] }
+        { \ EnterNotify [ enter-event ] }
+        { \ LeaveNotify [ leave-event ] }
+        { \ MotionNotify [ motion-event ] }
+        { \ KeyPress [ key-down-event ] }
+        { \ KeyRelease [ key-up-event ] }
+        { \ FocusIn [ focus-in-event ] }
+        { \ FocusOut [ focus-out-event ] }
+        { \ SelectionNotify [ selection-notify-event ] }
+        { \ SelectionRequest [ selection-request-event ] }
+        { \ ClientMessage [ client-event ] }
+        [ 3drop ]
+    } case ;
 
 : configured-loc ( event -- dim )
     dup XConfigureEvent-x swap XConfigureEvent-y 2array ;

diff --git a/extra/xml-rpc/xml-rpc.factor b/extra/xml-rpc/xml-rpc.factor
index 1194ff4df14c8a35767f2cf322d2e35e529a7bbc..4fee0e3f47038919c17d037edfa8be975bdeea9f 100755 (executable)
--- a/extra/xml-rpc/xml-rpc.factor
+++ b/extra/xml-rpc/xml-rpc.factor
@@ -111,7 +111,7 @@ TAG: boolean xml>item
     dup children>string {
         { [ dup "1" = ] [ 2drop t ] }
         { [ "0" = ] [ drop f ] }
-        { [ t ] [ "Bad boolean" server-error ] }
+        [ "Bad boolean" server-error ]
     } cond ;
 
 : unstruct-member ( tag -- )

diff --git a/extra/xml/tokenize/tokenize.factor b/extra/xml/tokenize/tokenize.factor
index b2b7d78b3e353557b7ab8fbf8f74745a64bcbcd9..de35f469cc04d494e466dec6f1ce168f5ecf1750 100644 (file)
--- a/extra/xml/tokenize/tokenize.factor
+++ b/extra/xml/tokenize/tokenize.factor
@@ -86,7 +86,7 @@ SYMBOL: ns-stack
         { [ dup not ] [ 2drop ] }
         { [ 2dup = ] [ 2drop next ] }
         { [ dup CHAR: & = ] [ drop parse-entity (parse-char) ] }
-        { [ t ] [ , next (parse-char) ] }
+        [ , next (parse-char) ]
     } cond ;
 
 : parse-char ( ch -- string )
@@ -194,9 +194,9 @@ SYMBOL: ns-stack
     {
         { [ get-char dup CHAR: ! = ] [ drop next direct ] }
         { [ CHAR: ? = ] [ next instruct ] } 
-        { [ t ] [
+        [
             start-tag [ dup add-ns pop-ns <closer> ]
             [ middle-tag end-tag ] if
             CHAR: > expect
-        ] }
+        ]
     } cond ;