sorting: Rename merge tuple to merge-state.

2013-03-23 21:56:56 -07:00 · 2013-03-23 21:56:56 -07:00 · 601738418e
parent 17a91ea5a3
commit 601738418e
1 changed files with 2 additions and 2 deletions
--- a/core/sorting/sorting.factor
+++ b/core/sorting/sorting.factor
@ -13,7 +13,7 @@ IN: sorting

 <PRIVATE

-TUPLE: merge
+TUPLE: merge-state
 { seq    array }
 { accum  vector }
 { accum1 vector }
@ -70,7 +70,7 @@ TUPLE: merge
    dup accum>> 0 >>length 2drop ; inline

 : <merge> ( seq -- merge )
-    \ merge new
+    \ merge-state new
        over >vector >>accum1
        swap length <vector> >>accum2
        dup accum1>> underlying>> >>seq