From: Doug Coleman Date: Tue, 21 Feb 2023 02:31:22 +0000 (-0600) Subject: sorting: better formatting X-Git-Tag: 0.99~537 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=c6270b732423504adf5c88bbb04e9cc1dc825318 sorting: better formatting --- diff --git a/core/sorting/sorting.factor b/core/sorting/sorting.factor index 949c306a67..5be28184a8 100644 --- a/core/sorting/sorting.factor +++ b/core/sorting/sorting.factor @@ -34,16 +34,18 @@ TUPLE: merge-state : dump-l ( merge -- ) [ accum>> ] keep - [ [ to1>> ] [ from1>> fixnum-fast ] [ accum>> length integer>fixnum-strict ] tri [ fixnum+fast >>length ] 2keep ] - [ seq>> ] - [ from1>> roll dupd fixnum+fast ] tri + [ + [ to1>> ] [ from1>> fixnum-fast ] [ accum>> length integer>fixnum-strict ] tri + [ fixnum+fast >>length ] 2keep + ] [ seq>> ] [ from1>> roll dupd fixnum+fast ] tri copy-loop drop ; inline : dump-r ( merge -- ) [ accum>> ] keep - [ [ to2>> ] [ from2>> fixnum-fast ] [ accum>> length integer>fixnum-strict ] tri [ fixnum+fast >>length ] 2keep ] - [ seq>> ] - [ from2>> roll dupd fixnum+fast ] tri + [ + [ to2>> ] [ from2>> fixnum-fast ] [ accum>> length integer>fixnum-strict ] tri + [ fixnum+fast >>length ] 2keep + ] [ seq>> ] [ from2>> roll dupd fixnum+fast ] tri copy-loop drop ; inline : l-next ( merge -- )