sorting: circularity if we use cleave in sorting

diff --git a/core/sorting/sorting.factor b/core/sorting/sorting.factor
index 398fbd79cfadfaf940ada9f0b80f63b0288c0808..969a80bc798dcdf0389015f656673ac4f8b6b99d 100644 (file)
--- a/core/sorting/sorting.factor
+++ b/core/sorting/sorting.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2005, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs combinators growable.private
+USING: accessors arrays assocs growable.private
 hashtables kernel kernel.private math math.order math.private
 sequences sequences.private vectors ;
 IN: sorting
@@ -33,20 +33,18 @@ TUPLE: merge-state
 : r-done? ( merge -- ? ) [ from2>> ] [ to2>> ] bi eq? ; inline
 
 : dump-l ( merge -- )
-    {
-        [ accum>> ]
-        [ [ to1>> ] [ from1>> fixnum-fast ] [ accum>> length integer>fixnum-strict ] tri [ fixnum+fast >>length ] 2keep ]
-        [ seq>> ]
-        [ from1>> roll dupd fixnum+fast ]
-    } cleave seq-copy-loop drop ; inline
+    [ accum>> ] keep
+    [ [ to1>> ] [ from1>> fixnum-fast ] [ accum>> length integer>fixnum-strict ] tri [ fixnum+fast >>length ] 2keep ]
+    [ seq>> ]
+    [ from1>> roll dupd fixnum+fast ] tri
+    seq-copy-loop drop ; inline
 
 : dump-r ( merge -- )
-    {
-        [ accum>> ]
-        [ [ to2>> ] [ from2>> fixnum-fast ] [ accum>> length integer>fixnum-strict ] tri [ fixnum+fast >>length ] 2keep ]
-        [ seq>> ]
-        [ from2>> roll dupd fixnum+fast ]
-    } cleave seq-copy-loop drop ; inline
+    [ accum>> ] keep
+    [ [ to2>> ] [ from2>> fixnum-fast ] [ accum>> length integer>fixnum-strict ] tri [ fixnum+fast >>length ] 2keep ]
+    [ seq>> ]
+    [ from2>> roll dupd fixnum+fast ] tri
+    seq-copy-loop drop ; inline
 
 : l-next ( merge -- )
     [ l-elt ] [ [ 1 + ] change-from1 accum>> ] bi push-unsafe ; inline