]> gitweb.factorcode.org Git - factor.git/commitdiff
sorting: Rename merge tuple to merge-state.
authorDoug Coleman <doug.coleman@gmail.com>
Sun, 24 Mar 2013 04:56:56 +0000 (21:56 -0700)
committerDoug Coleman <doug.coleman@gmail.com>
Sun, 24 Mar 2013 04:56:56 +0000 (21:56 -0700)
core/sorting/sorting.factor

index adc74357c6c91d0ad8bf5efdfdf4263a75024fdd..5ca547685e8746af7cac88cbc4489ae07335a7cd 100644 (file)
@@ -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