diff --git a/basis/sequences/parser/parser.factor b/basis/sequences/parser/parser.factor index 6f139cbeeb..60907fccad 100644 --- a/basis/sequences/parser/parser.factor +++ b/basis/sequences/parser/parser.factor @@ -132,7 +132,7 @@ TUPLE: sequence-parser sequence n ; sequence-parser [ n + ] change-n drop ] if ; -<< "length" [ length ] define-sorting >> +<< SORTING: length [ length ] >> : sort-tokens ( seq -- seq' ) { length>=< <=> } sort-by ; diff --git a/basis/sorting/human/human.factor b/basis/sorting/human/human.factor index 51baf50d22..6f0494b3c4 100644 --- a/basis/sorting/human/human.factor +++ b/basis/sorting/human/human.factor @@ -42,5 +42,5 @@ M: alphanum <=> <=> ] if ; -<< "human" [ find-numbers [ ] map ] define-sorting >> -<< "humani" [ find-numbers [ ] map ] define-sorting >> +<< SORTING: human [ find-numbers [ ] map ] >> +<< SORTING: humani [ find-numbers [ ] map ] >> diff --git a/basis/sorting/slots/slots-tests.factor b/basis/sorting/slots/slots-tests.factor index 72b6481c45..59b83ed2db 100644 --- a/basis/sorting/slots/slots-tests.factor +++ b/basis/sorting/slots/slots-tests.factor @@ -74,7 +74,7 @@ TUPLE: tuple2 d ; { { "a" "b" "c" } } [ { "b" "c" "a" } { <=> <=> } sort-by ] unit-test { { "b" "c" "a" } } [ { "b" "c" "a" } { } sort-by ] unit-test -<< "length-test" [ length ] define-sorting >> +<< SORTING: length-test [ length ] >> { { { 1 } { 1 2 3 } { 1 3 2 } { 3 2 1 } } } [ diff --git a/extra/c/lexer/lexer.factor b/extra/c/lexer/lexer.factor index 319107a123..9584e928c2 100644 --- a/extra/c/lexer/lexer.factor +++ b/extra/c/lexer/lexer.factor @@ -92,7 +92,7 @@ IN: c.lexer : take-c-identifier ( sequence-parser -- string/f ) [ (take-c-identifier) ] with-sequence-parser ; -<< "length" [ length ] define-sorting >> +<< SORTING: length [ length ] >> : sort-tokens ( seq -- seq' ) { length>=< <=> } sort-by ;