sequences: remove ??if

diff --git a/basis/compiler/tree/debugger/debugger.factor b/basis/compiler/tree/debugger/debugger.factor
index ed9c406b89de474fcd8fdb11dda8b41a5c95042a..fcaf50e3c0d7ab4dc184d364fa2fe6b5239c50e7 100644 (file)
--- a/basis/compiler/tree/debugger/debugger.factor
+++ b/basis/compiler/tree/debugger/debugger.factor
@@ -85,7 +85,7 @@ M: #shuffle node>quot
             [ dup { [ in-r>> empty? ] [ out-r>> empty? ] } 1&& ]
             [
                 shuffle-effect
-                [ pretty-shuffle ] [ % ] [ shuffle-node boa , ] ??if
+                [ pretty-shuffle ] [ % ] [ shuffle-node boa , ] ?if
             ]
         }
         [ drop "COMPLEX SHUFFLE" , ]

diff --git a/basis/compiler/tree/tuple-unboxing/tuple-unboxing.factor b/basis/compiler/tree/tuple-unboxing/tuple-unboxing.factor
index 217dd9a3da892830228055f2b31dbb4548bd4d2e..3d599b1a174d089648ed71faad14f0c8f0e04503 100644 (file)
--- a/basis/compiler/tree/tuple-unboxing/tuple-unboxing.factor
+++ b/basis/compiler/tree/tuple-unboxing/tuple-unboxing.factor
@@ -34,7 +34,7 @@ M: #push unbox-tuples* ( #push -- nodes )
 : (flatten-values) ( values accum -- )
     dup '[
         [ unboxed-allocation ]
-        [ _ (flatten-values) ] [ _ push ] ??if
+        [ _ (flatten-values) ] [ _ push ] ?if
     ] each ;
 
 : flatten-values ( values -- values' )

diff --git a/basis/xml/autoencoding/autoencoding.factor b/basis/xml/autoencoding/autoencoding.factor
index 602213d861711c4c4ec45cb89cbecdb71c7f2918..8d8fcbad7a510cee0359c874ba142a298100c56c 100644 (file)
--- a/basis/xml/autoencoding/autoencoding.factor
+++ b/basis/xml/autoencoding/autoencoding.factor
@@ -36,7 +36,7 @@ IN: xml.autoencoding
 : prolog-encoding ( prolog -- )
     encoding>> dup "UTF-16" =
     [ drop ] [
-        [ name>encoding ] [ decode-stream ] [ bad-encoding ] ??if
+        [ name>encoding ] [ decode-stream ] [ bad-encoding ] ?if
     ] if ;
 
 : instruct-encoding ( instruct/prolog -- )

diff --git a/core/kernel/kernel.factor b/core/kernel/kernel.factor
index 8c1fe8af65f2baccdb27f8adc3112b22cb056d69..f749f8901bb809baf976a8f94a8ae620aea6b4c7 100644 (file)
--- a/core/kernel/kernel.factor
+++ b/core/kernel/kernel.factor
@@ -121,9 +121,6 @@ DEFER: if
 : ?unless ( ..a obj cond: ( ..a obj -- obj/f ) false: ( ..a default -- ..b ) -- ..b )
     [ transmute* ] dip unless ; inline
 
-: ??if ( ..a obj cond: ( ..a obj -- obj/f ) true: ( ..a cond -- ..b ) false: ( ..a default -- ..b ) -- ..b )
-    [ transmute* ] 2dip if ; inline
-
 : ?if ( ..a obj cond true: ( ..a cond -- ..b ) false: ( ..a default -- ..b ) -- ..b )
     [ transmute* ] 2dip if ; inline
 

diff --git a/extra/webapps/wiki/wiki.factor b/extra/webapps/wiki/wiki.factor
index 4fab07c38f577a7983393dceaee1cfece66a6425..d55e0e1836d2738fed09c75406e3b14f165819e3 100644 (file)
--- a/extra/webapps/wiki/wiki.factor
+++ b/extra/webapps/wiki/wiki.factor
@@ -96,7 +96,7 @@ M: revision feed-entry-url id>> revision-url ;
                 { wiki "view" } <chloe-content>
             ] [
                 edit-url <redirect>
-            ] ??if
+            ] ?if
         ] >>display
 
     <article-boilerplate> ;