From acdbfb4956e484146d539d5d499798f16f41957e Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Sun, 19 Feb 2023 20:10:09 -0600
Subject: [PATCH] sequences: remove ??if

---
 basis/compiler/tree/debugger/debugger.factor             | 2 +-
 basis/compiler/tree/tuple-unboxing/tuple-unboxing.factor | 2 +-
 basis/xml/autoencoding/autoencoding.factor               | 2 +-
 core/kernel/kernel.factor                                | 3 ---
 extra/webapps/wiki/wiki.factor                           | 2 +-
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/basis/compiler/tree/debugger/debugger.factor b/basis/compiler/tree/debugger/debugger.factor
index ed9c406b89..fcaf50e3c0 100644
--- 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 217dd9a3da..3d599b1a17 100644
--- 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 602213d861..8d8fcbad7a 100644
--- 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 8c1fe8af65..f749f8901b 100644
--- 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 4fab07c38f..d55e0e1836 100644
--- 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> ;
-- 
2.34.1