Update code that did ">alist sort-" to just "sort-".

diff --git a/basis/heaps/heaps-tests.factor b/basis/heaps/heaps-tests.factor
index 703cf530805c06b44fbb6552847a12743c7d3d04..f0eed42418f807852eee45b479551ba0f8c059a8 100644 (file)
--- a/basis/heaps/heaps-tests.factor
+++ b/basis/heaps/heaps-tests.factor
@@ -36,7 +36,7 @@ IN: heaps.tests
     ] H{ } map>assoc ;
 
 : test-heap-sort ( n -- ? )
-    random-alist dup >alist sort-keys swap heap-sort = ;
+    random-alist dup sort-keys swap heap-sort = ;
 
 14 [
     [ t ] swap [ 2^ test-heap-sort ] curry unit-test

diff --git a/basis/help/markup/markup.factor b/basis/help/markup/markup.factor
index 8e0c423b590a9710a9202f5fcd2bdbddc7eebc1e..abc57118a35963d2ec2055972c18b331e38c33e9 100644 (file)
--- a/basis/help/markup/markup.factor
+++ b/basis/help/markup/markup.factor
@@ -452,7 +452,7 @@ M: array elements*
 
 : $definition-icons ( element -- )
     drop
-    icons get >alist sort-keys
+    icons get sort-keys
     [ [ <$link> ] [ definition-icon-path <$image> ] bi* swap ] assoc-map
     { "" "Definition class" } prefix
     $table ;

diff --git a/basis/http/http.factor b/basis/http/http.factor
index 2030b0d825129cff79e346230ddf8b474abbd914..4efec508763218f19d9c148a02ea6244858fcda6 100644 (file)
--- a/basis/http/http.factor
+++ b/basis/http/http.factor
@@ -37,7 +37,7 @@ CONSTANT: max-redirects 10
     [ "Header injection attack" throw ] when ;
 
 : write-header ( assoc -- )
-    >alist sort-keys [
+    sort-keys [
         [ check-header-string write ": " write ]
         [ header-value>string check-header-string write crlf ] bi*
     ] assoc-each crlf ;

diff --git a/basis/logging/analysis/analysis.factor b/basis/logging/analysis/analysis.factor
index 786aa77c52faeae180841cd8640b3944b08b389d..b58001100deb9dc5f1a796e27b9780387042dab8 100644 (file)
--- a/basis/logging/analysis/analysis.factor
+++ b/basis/logging/analysis/analysis.factor
@@ -21,7 +21,7 @@ SYMBOL: message-histogram
     drop ;\r
 \r
 : recent-histogram ( assoc n -- alist )\r
-    [ >alist sort-values <reversed> ] dip short head ;\r
+    [ sort-values <reversed> ] dip short head ;\r
 \r
 : analyze-entries ( entries word-names -- errors word-histogram message-histogram )\r
     [\r

diff --git a/basis/math/combinatorics/combinatorics.factor b/basis/math/combinatorics/combinatorics.factor
index 1d67f4870bd1618b703c0099279600525ea7fec3..1cc7d1462ae5272e4135f1edb43d4d5613605b3b 100644 (file)
--- a/basis/math/combinatorics/combinatorics.factor
+++ b/basis/math/combinatorics/combinatorics.factor
@@ -59,7 +59,7 @@ PRIVATE>
     swapd each-permutation ; inline
 
 : inverse-permutation ( seq -- permutation )
-    <enum> >alist sort-values keys ;
+    <enum> sort-values keys ;
 
 
 ! Combinadic-based combination methodology

diff --git a/basis/math/statistics/statistics.factor b/basis/math/statistics/statistics.factor
index e5b5fb0872cabcc6e0c3822baf2d9f56e9f4145b..47090fa8b85787d016983f640cd9aaa33ad8a3ed 100644 (file)
--- a/basis/math/statistics/statistics.factor
+++ b/basis/math/statistics/statistics.factor
@@ -80,7 +80,7 @@ PRIVATE>
     [ inc-at ] sequence>hashtable ;
 
 : sorted-histogram ( seq -- alist )
-    histogram >alist sort-values ;
+    histogram sort-values ;
 
 : collect-values ( seq quot: ( obj hashtable -- ) -- hash )
     '[ [ dup @ ] dip push-at ] sequence>hashtable ; inline

diff --git a/basis/regexp/minimize/minimize.factor b/basis/regexp/minimize/minimize.factor
index 7991efb047f1df9eab29ba7ddab01a6890bae709..e454a99c8bf7413cd336b2e8a4434e5e1b6db43b 100644 (file)
--- a/basis/regexp/minimize/minimize.factor
+++ b/basis/regexp/minimize/minimize.factor
@@ -47,7 +47,7 @@ IN: regexp.minimize
     over '[ drop first2 _ _ stay-same? ] assoc-filter ;
 
 : partition>classes ( partitions -- synonyms ) ! old-state => new-state
-    >alist sort-keys
+    sort-keys
     [ drop first2 swap ] assoc-map
     <reversed>
     >hashtable ;

diff --git a/basis/tools/threads/threads.factor b/basis/tools/threads/threads.factor
index 1bb0918b82e977ce190c72cb12edb4eb00f1e86d..71deb3f42a347ed0cee094589c5e4c37f6f9e6c1 100644 (file)
--- a/basis/tools/threads/threads.factor
+++ b/basis/tools/threads/threads.factor
@@ -28,7 +28,7 @@ IN: tools.threads
             [ [ write ] with-cell ] each\r
         ] with-row\r
 \r
-        threads >alist sort-keys values [\r
+        threads sort-keys values [\r
             [ thread. ] with-row\r
         ] each\r
     ] tabular-output nl ;\r

diff --git a/basis/ui/tools/error-list/error-list.factor b/basis/ui/tools/error-list/error-list.factor
index 13c849ddf163d1132e4e16de7e228a5d7e9b719a..5ae094b0bfa6959591268a5ece7230ee777cdded 100644 (file)
--- a/basis/ui/tools/error-list/error-list.factor
+++ b/basis/ui/tools/error-list/error-list.factor
@@ -59,7 +59,7 @@ M: source-file-renderer column-alignment drop { 0 0 1 } ;
 M: source-file-renderer filled-column drop 1 ;
 
 : <source-file-model> ( model -- model' )
-    [ group-by-source-file >alist sort-keys ] <arrow> ;
+    [ group-by-source-file sort-keys ] <arrow> ;
 
 :: <source-file-table> ( error-list -- table )
     error-list model>> <source-file-model>

diff --git a/basis/unicode/data/data.factor b/basis/unicode/data/data.factor
index b2cb4d205d380f9d0ef64a1f92a413bfaa813e25..dc6c4bfd991cc5b92dc48c50a4361409942ee9fa 100644 (file)
--- a/basis/unicode/data/data.factor
+++ b/basis/unicode/data/data.factor
@@ -141,7 +141,7 @@ PRIVATE>
     2dup bounds-check? [ set-nth ] [ 3drop ] if ;
 
 :: fill-ranges ( table -- table )
-    name-map >alist sort-values keys
+    name-map sort-values keys
     [ { [ "first>" tail? ] [ "last>" tail? ] } 1|| ] filter
     2 group [
         [ name>char ] bi@ [ [a,b] ] [ table ?nth ] bi

diff --git a/basis/xml/syntax/inverse/inverse.factor b/basis/xml/syntax/inverse/inverse.factor
index 1d37a8dedbabc01383885a63f8fae8440724efad..0d757b378cfdc5b2d574a56cb43fc4b9e3f5db2d 100644 (file)
--- a/basis/xml/syntax/inverse/inverse.factor
+++ b/basis/xml/syntax/inverse/inverse.factor
@@ -67,7 +67,7 @@ M: interpolated [undo-xml]
 
 : >enum ( assoc -- enum )
     ! Assumes keys are 0..n
-    >alist sort-keys values <enum> ;
+    sort-keys values <enum> ;
 
 : undo-xml ( xml -- quot )
     [undo-xml] '[ H{ } clone [ _ bind ] keep >enum ] ;

diff --git a/core/assocs/assocs-docs.factor b/core/assocs/assocs-docs.factor
index f4c27776e2e099fec0d546ed838c83aae736838e..883952296f5aa7a5915437dc9580885e14947890 100644 (file)
--- a/core/assocs/assocs-docs.factor
+++ b/core/assocs/assocs-docs.factor
@@ -24,7 +24,7 @@ ARTICLE: "enums" "Enumerations"
     <enum>
 }
 "Inverting a permutation using enumerations:"
-{ $example "IN: scratchpad" ": invert ( perm -- perm' )" "    <enum> >alist sort-values keys ;" "{ 2 0 4 1 3 } invert ." "{ 1 3 0 4 2 }" } ;
+{ $example "IN: scratchpad" ": invert ( perm -- perm' )" "    <enum> sort-values keys ;" "{ 2 0 4 1 3 } invert ." "{ 1 3 0 4 2 }" } ;
 
 HELP: enum
 { $class-description "An associative structure which wraps a sequence and maps integers to the corresponding elements of the sequence."

diff --git a/extra/benchmark/knucleotide/knucleotide.factor b/extra/benchmark/knucleotide/knucleotide.factor
index a161635ffe4361974f65a6165ece81fd25a57d42..241932215206ff3036db5c1185dabf631e14a4a4 100644 (file)
--- a/extra/benchmark/knucleotide/knucleotide.factor
+++ b/extra/benchmark/knucleotide/knucleotide.factor
@@ -19,7 +19,7 @@ CONSTANT: knucleotide-in "vocab:benchmark/knucleotide/knucleotide-input.txt"
 
 : handle-table ( inputs n -- )
     <clumps>
-    [ histogram >alist sort-values reverse ] [ length ] bi
+    [ histogram sort-values reverse ] [ length ] bi
     '[
         [ first write bl ]
         [ second 100 * _ /f "%.3f" printf nl ] bi

diff --git a/extra/oauth/oauth.factor b/extra/oauth/oauth.factor
index 0b00e9b875d2bd2b39b2850592c31a755d92025b..3d9c2f7ed667ee37128e1700059d4b547c7b05fd 100644 (file)
--- a/extra/oauth/oauth.factor
+++ b/extra/oauth/oauth.factor
@@ -53,7 +53,7 @@ nonce ;
     ] H{ } make-assoc ; inline
 
 :: sign-params ( url request-method consumer-token request-token params -- signed-params )
-    params >alist sort-keys :> params
+    params sort-keys :> params
     url request-method params signature-base-string :> sbs
     consumer-token secret>> request-token dup [ secret>> ] when hmac-key :> key
     sbs key sha1 hmac-bytes >base64 >string :> signature