From 8383c2124fea5da4177a69361b72f15c4b88b7dc Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Thu, 16 Feb 2023 22:17:21 -0600
Subject: [PATCH] factor: use more ?if and ?unless

---
 basis/unicode/case/case.factor             | 4 ++--
 basis/unicode/normalize/normalize.factor   | 2 +-
 basis/xml/name/name.factor                 | 2 +-
 basis/xml/tokenize/tokenize.factor         | 5 +++--
 basis/xmode/keyword-map/keyword-map.factor | 4 ++--
 basis/xmode/marker/marker.factor           | 8 ++++----
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/basis/unicode/case/case.factor b/basis/unicode/case/case.factor
index a40703e55f..5af8104250 100644
--- a/basis/unicode/case/case.factor
+++ b/basis/unicode/case/case.factor
@@ -70,9 +70,9 @@ CATEGORY-NOT: (uncased) Lu Ll Lt Lm Mn Me ;
 :: map-case ( string string-quot char-quot -- case )
     string length <sbuf> :> out
     string [
-        dup special-case
+        [ special-case ]
         [ string-quot call out push-all ]
-        [ char-quot call out push ] ?if-old
+        [ char-quot call out push ] ?if
     ] each out "" like ; inline
 
 : locale>lower ( string -- string' )
diff --git a/basis/unicode/normalize/normalize.factor b/basis/unicode/normalize/normalize.factor
index 2ad79ef360..233e2ae658 100644
--- a/basis/unicode/normalize/normalize.factor
+++ b/basis/unicode/normalize/normalize.factor
@@ -27,7 +27,7 @@ CONSTANT: final-count 28
 
 ! These numbers come from UAX 29
 : initial? ( ch -- ? )
-    dup 0x1100 0x1159 ?between? [ ] [ 0x115F = ] ?if-old ; inline
+    [ 0x1100 0x1159 ?between? ] [ 0x115F = ] ?unless ; inline
 : medial? ( ch -- ? ) 0x1160 0x11A2 ?between? ; inline
 : final? ( ch -- ? ) 0x11A8 0x11F9 ?between? ; inline
 
diff --git a/basis/xml/name/name.factor b/basis/xml/name/name.factor
index 1c9c0dac3a..0367c60f6f 100644
--- a/basis/xml/name/name.factor
+++ b/basis/xml/name/name.factor
@@ -74,7 +74,7 @@ SYMBOL: ns-stack
     ] [ drop f ] if* ;
 
 : interpret-name ( str -- name )
-    dup prefixed-name [ ] [ <simple-name> ] ?if-old ;
+    [ prefixed-name ] [ <simple-name> ] ?unless ;
 
 PRIVATE>
 
diff --git a/basis/xml/tokenize/tokenize.factor b/basis/xml/tokenize/tokenize.factor
index 500ee7a0aa..e08b68f815 100644
--- a/basis/xml/tokenize/tokenize.factor
+++ b/basis/xml/tokenize/tokenize.factor
@@ -128,8 +128,9 @@ HINTS: next* { spot } ;
     ] [ parse-named-entity ] if ;
 
 : parse-pe ( accum -- )
-    take-; dup pe-table get at
-    [ swap push-all ] [ no-entity ] ?if-old ;
+    take-;
+    [ pe-table get at ]
+    [ swap push-all ] [ no-entity ] ?if ;
 
 :: (parse-char) ( quot: ( ch -- ? ) accum spot -- )
     spot char>> :> char
diff --git a/basis/xmode/keyword-map/keyword-map.factor b/basis/xmode/keyword-map/keyword-map.factor
index da5545b698..9f2376b1e2 100644
--- a/basis/xmode/keyword-map/keyword-map.factor
+++ b/basis/xmode/keyword-map/keyword-map.factor
@@ -34,9 +34,9 @@ M: keyword-map >alist
     keys union-all [ alpha? ] reject sort ;
 
 : keyword-map-no-word-sep* ( keyword-map -- str )
-    dup no-word-sep>> [ ] [
+    [ no-word-sep>> ] [
         dup (keyword-map-no-word-sep) >>no-word-sep
         keyword-map-no-word-sep*
-    ] ?if-old ;
+    ] ?unless ;
 
 INSTANCE: keyword-map assoc
diff --git a/basis/xmode/marker/marker.factor b/basis/xmode/marker/marker.factor
index 1799fa48a6..5c211affa4 100644
--- a/basis/xmode/marker/marker.factor
+++ b/basis/xmode/marker/marker.factor
@@ -198,11 +198,11 @@ GENERIC: handle-rule-start ( match-count rule -- )
 GENERIC: handle-rule-end ( match-count rule -- )
 
 : find-escape-rule ( -- rule )
-    context get dup
-    in-rule-set>> escape-rule>> [ ] [
+    context get
+    [ in-rule-set>> escape-rule>> ] [
         parent>> in-rule-set>>
-        dup [ escape-rule>> ] when
-    ] ?if-old ;
+        [ escape-rule>> ] ?transmute
+    ] ?unless ;
 
 : check-escape-rule ( rule -- ? )
     escape-rule>> [ find-escape-rule ] unless*
-- 
2.34.1