From 94d7772c1352c5db0c57b5431d86dff47034e90c Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Sun, 5 Oct 2008 18:26:24 -0500
Subject: [PATCH] remove unused word, make some stuff compile
---
basis/unicode/collation/collation-tests.factor | 6 +-----
basis/unicode/collation/collation.factor | 9 ++++-----
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/basis/unicode/collation/collation-tests.factor b/basis/unicode/collation/collation-tests.factor
index bf87c6b7da..be6af2d920 100644
--- a/basis/unicode/collation/collation-tests.factor
+++ b/basis/unicode/collation/collation-tests.factor
@@ -11,11 +11,7 @@ IN: unicode.collation.tests
: test-two ( str1 str2 -- )
[ +lt+ ] -rot [ string<=> ] 2curry unit-test ;
-: failures
- parse-test dup 2 <clumps>
- [ string<=> +lt+ = not ] assoc-filter dup assoc-size ;
-
-: test-equality
+: test-equality ( str1 str2 -- )
{ primary= secondary= tertiary= quaternary= }
[ execute ] with with each ;
diff --git a/basis/unicode/collation/collation.factor b/basis/unicode/collation/collation.factor
index 8e9e2963a8..65786ede5d 100644
--- a/basis/unicode/collation/collation.factor
+++ b/basis/unicode/collation/collation.factor
@@ -100,8 +100,8 @@ ducet insert-helpers
] { } map-as concat ;
: append-weights ( weights quot -- )
- swap [ ignorable?>> not ] filter
- swap map [ zero? not ] filter % 0 , ;
+ [ [ ignorable?>> not ] filter ] dip
+ map [ zero? not ] filter % 0 , ; inline
: variable-weight ( weight -- )
dup ignorable?>> [ primary>> ] [ drop HEX: FFFF ] if , ;
@@ -135,7 +135,7 @@ PRIVATE>
<PRIVATE
: insensitive= ( str1 str2 levels-removed -- ? )
[
- swap collation-key swap
+ [ collation-key ] dip
[ [ 0 = not ] trim-right but-last ] times
] curry bi@ = ;
PRIVATE>
@@ -158,8 +158,7 @@ PRIVATE>
PRIVATE>
: sort-strings ( strings -- sorted )
- [ w/collation-key ] map
- natural-sort values ;
+ [ w/collation-key ] map natural-sort values ;
: string<=> ( str1 str2 -- <=> )
[ w/collation-key ] compare ;