extra: using keepd instead of "2keep drop".

diff --git a/extra/modern/out/out.factor b/extra/modern/out/out.factor
index 1eb4634350e39f976c60dd709f003b12ccdd986a..054a4d8e4543312e8f14f3c9240d00abb62282e0 100644 (file)
--- a/extra/modern/out/out.factor
+++ b/extra/modern/out/out.factor
@@ -67,7 +67,7 @@ DEFER: map-literals
 : rewrite-paths ( seq quot: ( obj -- obj' ) -- ) '[ _ rewrite-path ] each ; inline recursive
 
 : rewrite-vocab ( vocab quot: ( obj -- obj' ) -- )
-    [ [ vocab>literals ] dip map-literals ] 2keep drop write-modern-vocab ; inline recursive
+    [ [ vocab>literals ] dip map-literals ] keepd write-modern-vocab ; inline recursive
 
 : rewrite-string-exact ( string -- string' )
     string>literals write-modern-string ;

diff --git a/extra/modern/slices/slices.factor b/extra/modern/slices/slices.factor
index ad14276a06a2ca84b078f013f22e07ffae85ca80..dca6feb58e2dc89f68b533cd18803c1565c42a3f 100644 (file)
--- a/extra/modern/slices/slices.factor
+++ b/extra/modern/slices/slices.factor
@@ -60,7 +60,7 @@ ERROR: unexpected-end n string ;
     [ to>> ] [ seq>> ] bi ?nth ;
 
 : find-from* ( ... n seq quot: ( ... elt -- ... ? ) -- ... i elt ? )
-    [ find-from ] 2keep drop
+    [ find-from ] keepd
     pick [ drop t ] [ length -rot nip f ] if ; inline
 
 : skip-blank-from ( n string -- n' string )
@@ -224,5 +224,5 @@ ERROR: subseq-expected-but-got-eof n string expected ;
     pick [
         length swap [ - ] dip
     ] [
-        [ nip ] dip [ [ length ] bi@ - ] 2keep drop
+        [ nip ] dip [ [ length ] bi@ - ] keepd
     ] if ; inline

diff --git a/extra/sequences/extras/extras.factor b/extra/sequences/extras/extras.factor
index 929354d138dc43f8de349123a436b949d67052b9..910954adf350f261a1f67ed19847c4d93d571400 100644 (file)
--- a/extra/sequences/extras/extras.factor
+++ b/extra/sequences/extras/extras.factor
@@ -628,10 +628,10 @@ PRIVATE>
     [ dup length ] unless* tail-slice ; inline
 
 : count-head ( seq quot -- n )
-    [ not ] compose [ find drop ] 2keep drop length or ; inline
+    [ not ] compose [ find drop ] keepd length or ; inline
 
 : count-tail ( seq quot -- n )
-    [ not ] compose [ find-last drop ] 2keep drop
+    [ not ] compose [ find-last drop ] keepd
     length swap [ - 1 - ] when* ; inline
 
 :: interleaved-as ( seq glue exemplar -- newseq )