From d63c992d97f415ba97b115356d796e2da2dadbe1 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Thu, 9 Feb 2017 16:29:14 -0800
Subject: [PATCH] using when instead of [ ] if.

---
 extra/crypto/aes/aes.factor                      | 3 +--
 extra/model-viewer/model-viewer.factor           | 2 +-
 extra/mongodb/connection/connection.factor       | 2 +-
 extra/mongodb/tuple/persistent/persistent.factor | 8 +++-----
 extra/oauth2/oauth2.factor                       | 3 +--
 extra/readline-listener/readline-listener.factor | 5 +++--
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/extra/crypto/aes/aes.factor b/extra/crypto/aes/aes.factor
index 0695eb127a..5e37d3d1f6 100644
--- a/extra/crypto/aes/aes.factor
+++ b/extra/crypto/aes/aes.factor
@@ -266,8 +266,7 @@ M:: aes-decrypt (expand-key) ( K Nr -- sched )
     K Nr (expand-enc-key) dup length :> key-length
     [
         [ 4 >= ] [ key-length 4 - < ] bi and
-        [ subword ui32-rev> d-transform ]
-        [ ] if
+        [ subword ui32-rev> d-transform ] when
     ] map-index ;
 
 M: aes-decrypt (first-round) ( aes -- aes' )
diff --git a/extra/model-viewer/model-viewer.factor b/extra/model-viewer/model-viewer.factor
index 68a7b73377..b7e518522a 100644
--- a/extra/model-viewer/model-viewer.factor
+++ b/extra/model-viewer/model-viewer.factor
@@ -102,7 +102,7 @@ TUPLE: vbo
         B{ 0 0 0 } >>bitmap ;
 
 : make-texture ( pathname alt -- texture )
-    swap [ nip load-image ] [ ] if*
+    swap [ nip load-image ] when*
     [
         [ component-order>> ]
         [ component-type>> ] bi
diff --git a/extra/mongodb/connection/connection.factor b/extra/mongodb/connection/connection.factor
index df468bd0fa..f93f489d20 100644
--- a/extra/mongodb/connection/connection.factor
+++ b/extra/mongodb/connection/connection.factor
@@ -114,7 +114,7 @@ CONSTRUCTOR: <mdb-connection> mdb-connection ( instance -- mdb-connection ) ;
 : eval-ismaster-result ( node result -- )
    [
         [ "ismaster" ] dip at dup string?
-        [ >integer 1 = ] [ ] if >>master? drop
+        [ >integer 1 = ] when >>master? drop
    ] [
         [ "remote" ] dip at
         [ split-host-str <inet> f <mdb-node> >>remote ] when* drop
diff --git a/extra/mongodb/tuple/persistent/persistent.factor b/extra/mongodb/tuple/persistent/persistent.factor
index 72c7237a77..78fb5d8cce 100644
--- a/extra/mongodb/tuple/persistent/persistent.factor
+++ b/extra/mongodb/tuple/persistent/persistent.factor
@@ -104,8 +104,6 @@ M: tuple tuple>selector ( tuple -- assoc )
     prepare-assoc [ tuple>selector ] write-tuple-fields ;
 
 : assoc>tuple ( assoc -- tuple )
-   dup assoc?
-   [ [ dup tuple-info?
-       [ make-tuple ]
-       [ ] if ] [ drop ] recover
-   ] [ ] if ; inline recursive
+   dup assoc? [
+        [ dup tuple-info? [ make-tuple ] when ] ignore-errors
+   ] when ; inline recursive
diff --git a/extra/oauth2/oauth2.factor b/extra/oauth2/oauth2.factor
index 09ecf548a5..daea9f950e 100644
--- a/extra/oauth2/oauth2.factor
+++ b/extra/oauth2/oauth2.factor
@@ -6,8 +6,7 @@ webbrowser ;
 IN: oauth2
 
 : console-prompt ( query -- str/f )
-    write flush readln [ blank? ] trim
-    dup "" = [ drop f ] [ ] if ;
+    write flush readln [ blank? ] trim [ f ] when-empty ;
 
 : post-json-request ( params token-uri -- assoc )
     <post-request> dup header>> "application/json" "Accept" rot set-at
diff --git a/extra/readline-listener/readline-listener.factor b/extra/readline-listener/readline-listener.factor
index a789d33308..d783e582b5 100644
--- a/extra/readline-listener/readline-listener.factor
+++ b/extra/readline-listener/readline-listener.factor
@@ -13,8 +13,9 @@ TUPLE: readline-reader { prompt initial: f } ;
 INSTANCE: readline-reader input-stream
 
 M: readline-reader stream-readln
-    flush [ prompt>> dup [ " " append ] [ ] if readline ]
-    keep f >>prompt drop ;
+    flush
+    [ dup [ " " append ] when readline f ] change-prompt
+    drop ;
 
 M: readline-reader prompt.
     >>prompt drop ;