[ [ ... ] compare ] sort => [ ... ] sort-with

diff --git a/basis/compiler/cfg/ssa/interference/interference.factor b/basis/compiler/cfg/ssa/interference/interference.factor
index f8553ec9de27eac9b5e7cd66fdbd8cb0569adb16..dd002ec977eaa4c5e179d987fc63d35cabd25c63 100644 (file)
--- a/basis/compiler/cfg/ssa/interference/interference.factor
+++ b/basis/compiler/cfg/ssa/interference/interference.factor
@@ -58,7 +58,7 @@ PRIVATE>
 : sort-vregs-by-bb ( vregs -- alist )
     defs get
     '[ dup _ at ] { } map>assoc
-    [ [ second pre-of ] compare ] sort ;
+    [ second pre-of ] sort-with ;
 
 : ?last ( seq -- elt/f ) [ f ] [ last ] if-empty ; inline
 

diff --git a/basis/heaps/heaps-tests.factor b/basis/heaps/heaps-tests.factor
index b4761075628044451643170673cbabd6267c3d9b..c1985c516f995cdee7c614985f4e9330a4b7c36e 100644 (file)
--- a/basis/heaps/heaps-tests.factor
+++ b/basis/heaps/heaps-tests.factor
@@ -52,7 +52,7 @@ IN: heaps.tests
 ] each
 
 : sort-entries ( entries -- entries' )
-    [ [ key>> ] compare ] sort ;
+    [ key>> ] sort-with ;
 
 : delete-test ( n -- obj1 obj2 )
     [

diff --git a/basis/help/html/html.factor b/basis/help/html/html.factor
index 84f708a6870a4a39754061286c4b6355ad7f6a0b..6f875496196e516b68c6bc3d8dc578df1f303aae 100644 (file)
--- a/basis/help/html/html.factor
+++ b/basis/help/html/html.factor
@@ -115,7 +115,7 @@ TUPLE: result title href ;
     load-index swap >lower
     '[ [ drop _ ] dip >lower subseq? ] assoc-filter
     [ swap result boa ] { } assoc>map
-    [ [ title>> ] compare ] sort ;
+    [ title>> ] sort-with ;
 
 : article-apropos ( string -- results )
     "articles.idx" offline-apropos ;

diff --git a/basis/interval-maps/interval-maps.factor b/basis/interval-maps/interval-maps.factor
index 22283deecb5971a7c0a9caa3c2ac89c076f7def0..b94266282cf057ee19d048bb79d14bf8adfe6bfd 100644 (file)
--- a/basis/interval-maps/interval-maps.factor
+++ b/basis/interval-maps/interval-maps.factor
@@ -46,7 +46,7 @@ PRIVATE>
     array>> [ value ] map ;\r
 \r
 : <interval-map> ( specification -- map )\r
-    all-intervals [ [ first second ] compare ] sort\r
+    all-intervals [ first second ] sort-with\r
     >intervals ensure-disjoint interval-map boa ;\r
 \r
 : <interval-set> ( specification -- map )\r

diff --git a/basis/splitting/monotonic/monotonic.factor b/basis/splitting/monotonic/monotonic.factor
index 088de527665d0667adbae979b806174237314f01..3dec6130de5a3e83b747cbeeff0a078e10d52294 100644 (file)
--- a/basis/splitting/monotonic/monotonic.factor
+++ b/basis/splitting/monotonic/monotonic.factor
@@ -64,6 +64,6 @@ TUPLE: upward-slice < slice ;
             drop
             [ downward-slices ]
             [ stable-slices ]
-            [ upward-slices ] tri 3append [ [ from>> ] compare ] sort
+            [ upward-slices ] tri 3append [ from>> ] sort-with
         ]
     } case ;

diff --git a/basis/ui/gadgets/menus/menus.factor b/basis/ui/gadgets/menus/menus.factor
index 159da59be5a1e0013be2ad79898c7552fd7eaa9a..70818262c5542143fc8def2109cf3d223baca3d1 100644 (file)
--- a/basis/ui/gadgets/menus/menus.factor
+++ b/basis/ui/gadgets/menus/menus.factor
@@ -65,7 +65,7 @@ M: ---- <menu-item>
 : <operations-menu> ( target hook -- menu )
     over object-operations
     [ primary-operation? ] partition
-    [ reverse ] [ [ [ command-name ] compare ] sort ] bi*
+    [ reverse ] [ [ command-name ] sort-with ] bi*
     { ---- } glue <commands-menu> ;
 
 : show-operations-menu ( gadget target hook -- )

diff --git a/basis/ui/tools/inspector/inspector.factor b/basis/ui/tools/inspector/inspector.factor
index 35fa5e3c172dccc983802f044cf7a4f5563499c7..b4a772dca56847465e4c78816caafd133b2a5449 100644 (file)
--- a/basis/ui/tools/inspector/inspector.factor
+++ b/basis/ui/tools/inspector/inspector.factor
@@ -57,7 +57,7 @@ M: object make-slot-descriptions
     make-mirror [ <slot-description> ] { } assoc>map ;
 
 M: hashtable make-slot-descriptions
-    call-next-method [ [ key-string>> ] compare ] sort ;
+    call-next-method [ key-string>> ] sort-with ;
 
 : <inspector-table> ( model -- table )
     [ make-slot-descriptions ] <arrow> inspector-renderer <table>

diff --git a/basis/vocabs/prettyprint/prettyprint.factor b/basis/vocabs/prettyprint/prettyprint.factor
index 0e150ef07a7d1e38949202bc5a60cf43ddb1fb81..66bc277ef7d3f1bc50e9e2fe2082e9080b17048f 100644 (file)
--- a/basis/vocabs/prettyprint/prettyprint.factor
+++ b/basis/vocabs/prettyprint/prettyprint.factor
@@ -14,7 +14,7 @@ IN: vocabs.prettyprint
 <PRIVATE
 
 : sort-vocabs ( seq -- seq' )
-    [ [ vocab-name ] compare ] sort ;
+    [ vocab-name ] sort-with ;
 
 : pprint-using ( seq -- )
     [ "syntax" vocab = not ] filter

diff --git a/core/classes/algebra/algebra.factor b/core/classes/algebra/algebra.factor
index 6d221c138007c9d8f974d8d91143584f480444bc..6bfc94d79a8a390dcfcd5b9762742c91be0d6074 100755 (executable)
--- a/core/classes/algebra/algebra.factor
+++ b/core/classes/algebra/algebra.factor
@@ -207,7 +207,7 @@ M: anonymous-complement (classes-intersect?)
     [ "Topological sort failed" throw ] unless* ;\r
 \r
 : sort-classes ( seq -- newseq )\r
-    [ [ name>> ] compare ] sort >vector\r
+    [ name>> ] sort-with >vector\r
     [ dup empty? not ]\r
     [ dup largest-class [ over delete-nth ] dip ]\r
     produce nip ;\r

diff --git a/core/sorting/sorting.factor b/core/sorting/sorting.factor
index 312ddcd9bee15b0b7a2771f16dc7f411c9dfd700..b8258b239bfebd28e1d126d22541262de9374a2e 100644 (file)
--- a/core/sorting/sorting.factor
+++ b/core/sorting/sorting.factor
@@ -160,8 +160,8 @@ PRIVATE>
 : inv-sort-with ( seq quot -- sortedseq )
     [ compare invert-comparison ] curry sort ; inline
 
-: sort-keys ( seq -- sortedseq ) [ [ first ] compare ] sort ;
+: sort-keys ( seq -- sortedseq ) [ first ] sort-with ;
 
-: sort-values ( seq -- sortedseq ) [ [ second ] compare ] sort ;
+: sort-values ( seq -- sortedseq ) [ second ] sort-with ;
 
 : sort-pair ( a b -- c d ) 2dup after? [ swap ] when ;

diff --git a/core/source-files/errors/errors.factor b/core/source-files/errors/errors.factor
index f6f4f4825aaf9b8da76ff17d9b01d402557f7267..86a8354071e5c54f90103324c3039847cb567c98 100644 (file)
--- a/core/source-files/errors/errors.factor
+++ b/core/source-files/errors/errors.factor
@@ -7,7 +7,7 @@ IN: source-files.errors
 TUPLE: source-file-error error asset file line# ;
 
 : sort-errors ( errors -- alist )
-    [ [ [ line#>> ] compare ] sort ] { } assoc-map-as sort-keys ;
+    [ [ line#>> ] sort-with ] { } assoc-map-as sort-keys ;
 
 : group-by-source-file ( errors -- assoc )
     H{ } clone [ [ push-at ] curry [ dup file>> ] prepose each ] keep ;

diff --git a/extra/dns/util/util.factor b/extra/dns/util/util.factor
index f47eb7010c6dbbf0b4c16862f628d87edafcb065..6934d3bbd916f3dceb7d1a18ed1b2c71747b4d35 100644 (file)
--- a/extra/dns/util/util.factor
+++ b/extra/dns/util/util.factor
@@ -10,7 +10,7 @@ MACRO: 1if ( test then else -- ) '[ dup @ _ _ if ] ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: sort-largest-first ( seq -- seq ) [ [ length ] compare ] sort reverse ;
+: sort-largest-first ( seq -- seq ) [ length ] sort-with reverse ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 

diff --git a/extra/webapps/pastebin/pastebin.factor b/extra/webapps/pastebin/pastebin.factor
index 6a52d02009df3b1b562b44d3dccfda232370f63e..2c51d41aa016de58e9e54480e7ab2b35d14698c9 100644 (file)
--- a/extra/webapps/pastebin/pastebin.factor
+++ b/extra/webapps/pastebin/pastebin.factor
@@ -59,7 +59,7 @@ TUPLE: paste < entity annotations ;
 
 : pastes ( -- pastes )
     f <paste> select-tuples
-    [ [ date>> ] compare ] sort
+    [ date>> ] sort-with
     reverse ;
 
 TUPLE: annotation < entity parent ;

diff --git a/extra/webapps/planet/planet.factor b/extra/webapps/planet/planet.factor
index 12b7ccda24827815952edcb45cdce948d377b9a8..8ada4be638b54f50dc9640c6b39391a60716c2e2 100755 (executable)
--- a/extra/webapps/planet/planet.factor
+++ b/extra/webapps/planet/planet.factor
@@ -56,7 +56,7 @@ posting "POSTINGS"
 
 : blogroll ( -- seq )
     f <blog> select-tuples
-    [ [ name>> ] compare ] sort ;
+    [ name>> ] sort-with ;
 
 : postings ( -- seq )
     posting new select-tuples

diff --git a/extra/webapps/wiki/wiki.factor b/extra/webapps/wiki/wiki.factor
index 5689f23d4ea6cfd60f3e30e1ac2f5e8f574316c9..118f92061b509cd9a567d5d177568c839cc219de 100644 (file)
--- a/extra/webapps/wiki/wiki.factor
+++ b/extra/webapps/wiki/wiki.factor
@@ -307,7 +307,7 @@ M: revision feed-entry-url id>> revision-url ;
 
         [
             f <article> select-tuples
-            [ [ title>> ] compare ] sort
+            [ title>> ] sort-with
             "articles" set-value
         ] >>init