basis: fewer tokens when possible using if*.

diff --git a/basis/furnace/conversations/conversations.factor b/basis/furnace/conversations/conversations.factor
index be10a1d30b486be5fbf271d77de5f9402efaef6e..e66941bda048e6fc157ec2b4c607fdfea68c1e48 100644 (file)
--- a/basis/furnace/conversations/conversations.factor
+++ b/basis/furnace/conversations/conversations.factor
@@ -99,12 +99,12 @@ M: conversations call-responder*
     <redirect> ;
 
 : restore-conversation ( seq -- )
-    conversation get dup [
+    conversation get [
         namespace>>
         [ '[ _ key? ] filter ]
         [ '[ [ _ at ] keep set ] each ]
         bi
-    ] [ 2drop ] if ;
+    ] [ drop ] if* ;
 
 M: conversations modify-form ( conversations -- xml/f )
     drop

diff --git a/basis/stack-checker/dependencies/dependencies.factor b/basis/stack-checker/dependencies/dependencies.factor
index a005eaeb443225c30a43ce42f56ea5b9b2645e3a..220bf4995f024dfb9fb3bc260e0f394b07ca4038 100644 (file)
--- a/basis/stack-checker/dependencies/dependencies.factor
+++ b/basis/stack-checker/dependencies/dependencies.factor
@@ -58,8 +58,8 @@ SYMBOL: generic-dependencies
     [ class-or ] when* ;
 
 : add-depends-on-generic ( class generic -- )
-    generic-dependencies get dup
-    [ [ ?class-or ] change-at ] [ 3drop ] if ;
+    generic-dependencies get
+    [ [ ?class-or ] change-at ] [ 2drop ] if* ;
 
 ! Conditional dependencies are re-evaluated when classes change;
 ! if any fail, the word is recompiled
@@ -69,7 +69,7 @@ GENERIC: satisfied? ( dependency -- ? )
 
 : add-conditional-dependency ( ... class -- )
     boa conditional-dependencies get
-    dup [ adjoin ] [ 2drop ] if ; inline
+    [ adjoin ] [ drop ] if* ; inline
 
 TUPLE: depends-on-class-predicate class1 class2 result ;
 

diff --git a/basis/tools/trace/trace.factor b/basis/tools/trace/trace.factor
index fcc76071dc739113fc78ad609faf0cd3b11f6428..9d7bb9acc65fcfb5c8427a06158b2aaf30ceb22f 100644 (file)
--- a/basis/tools/trace/trace.factor
+++ b/basis/tools/trace/trace.factor
@@ -20,10 +20,10 @@ exclude-vocabs { "math" "accessors" } swap set-global
 SYMBOL: end
 
 : include? ( vocab -- ? )
-    include-vocabs get dup [ member? ] [ 2drop t ] if ;
+    include-vocabs get [ member? ] [ drop t ] if* ;
 
 : exclude? ( vocab -- ? )
-    exclude-vocabs get dup [ member? ] [ 2drop f ] if ;
+    exclude-vocabs get [ member? ] [ drop f ] if* ;
 
 : into? ( obj -- ? )
     {

diff --git a/basis/vocabs/refresh/refresh.factor b/basis/vocabs/refresh/refresh.factor
index 8276a59fb3750da10bcc4a613f7edfefa3971e5f..c1109594304c848783648c72dffd654664b47f5d 100644 (file)
--- a/basis/vocabs/refresh/refresh.factor
+++ b/basis/vocabs/refresh/refresh.factor
@@ -32,7 +32,7 @@ SYMBOL: changed-vocabs
     [ unchanged-vocab ] each ;
 
 : changed-vocab? ( vocab -- ? )
-    changed-vocabs get dup [ key? ] [ 2drop t ] if ;
+    changed-vocabs get [ key? ] [ drop t ] if* ;
 
 : filter-changed ( vocabs -- vocabs' )
     [ changed-vocab? ] filter ;