factor: use ??if instead of ?if-old

[factor.git] / core / vocabs / loader / loader.factor

diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor
index 04a9b97191acddf5d8184ec61c4f5536cf457896..a4921ae0ed270ac37ab9789baf3c9ac59ad73682 100644 (file)
--- a/core/vocabs/loader/loader.factor
+++ b/core/vocabs/loader/loader.factor
@@ -77,7 +77,7 @@ PRIVATE>
     ] if ;
 
 : vocab-exists? ( name -- ? )
-    dup lookup-vocab [ ] [ find-vocab-root ] ?if ;
+    [ lookup-vocab ] [ find-vocab-root ] ?unless ;
 
 : vocab-append-path ( vocab path -- newpath )
     swap find-vocab-root [ prepend-path ] [ drop f ] if* ;
@@ -148,13 +148,13 @@ PRIVATE>
     ] when* require ;
 
 : run ( vocab -- )
-    dup load-vocab vocab-main [
-        execute( -- )
-    ] [
+    [ load-vocab vocab-main ]
+    [ execute( -- ) ]
+    [
         "The " write vocab-name write
         " vocabulary does not define an entry point." print
         "To define one, refer to \\ MAIN: help" print
-    ] ?if ;
+    ] ??if ;
 
 <PRIVATE