From 1754ab73bd7182f3fd7a3d30d397ef9b1cc864e6 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Sat, 23 Mar 2013 22:25:02 -0700
Subject: [PATCH] basis: fewer tokens when possible using if*.

---
 basis/furnace/conversations/conversations.factor     | 4 ++--
 basis/stack-checker/dependencies/dependencies.factor | 6 +++---
 basis/tools/trace/trace.factor                       | 4 ++--
 basis/vocabs/refresh/refresh.factor                  | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/basis/furnace/conversations/conversations.factor b/basis/furnace/conversations/conversations.factor
index be10a1d30b..e66941bda0 100644
--- 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 a005eaeb44..220bf4995f 100644
--- 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 fcc76071dc..9d7bb9acc6 100644
--- 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 8276a59fb3..c110959430 100644
--- 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 ;
-- 
2.34.1