From e13be8ce3f1cd17032646914f42b04343c031536 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sun, 11 May 2008 13:07:07 -0500 Subject: [PATCH] Use unique word --- core/words/words.factor | 4 ++-- extra/assocs/lib/lib.factor | 3 --- extra/unicode/breaks/breaks.factor | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/core/words/words.factor b/core/words/words.factor index b640cc6384..5812516912 100755 --- a/core/words/words.factor +++ b/core/words/words.factor @@ -3,7 +3,7 @@ USING: arrays definitions graphs assocs kernel kernel.private slots.private math namespaces sequences strings vectors sbufs quotations assocs hashtables sorting words.private vocabs -math.order ; +math.order sets ; IN: words : word ( -- word ) \ word get-global ; @@ -121,7 +121,7 @@ SYMBOL: +called+ compiled-crossref get at ; : compiled-usages ( words -- seq ) - [ [ dup ] H{ } map>assoc dup ] keep [ + [ unique dup ] keep [ compiled-usage [ nip +inlined+ eq? ] assoc-filter update ] with each keys ; diff --git a/extra/assocs/lib/lib.factor b/extra/assocs/lib/lib.factor index 247be44bad..7c274edb2e 100755 --- a/extra/assocs/lib/lib.factor +++ b/extra/assocs/lib/lib.factor @@ -2,9 +2,6 @@ USING: arrays assocs kernel vectors sequences namespaces random math.parser ; IN: assocs.lib -: >set ( seq -- hash ) - [ dup ] H{ } map>assoc ; - : ref-at ( table key -- value ) swap at ; : put-at* ( table key value -- ) swap rot set-at ; diff --git a/extra/unicode/breaks/breaks.factor b/extra/unicode/breaks/breaks.factor index 7ef97d553c..dfac27f7a4 100755 --- a/extra/unicode/breaks/breaks.factor +++ b/extra/unicode/breaks/breaks.factor @@ -1,7 +1,7 @@ USING: unicode.categories kernel math combinators splitting sequences math.parser io.files io assocs arrays namespaces math.ranges unicode.normalize values io.encodings.ascii -unicode.syntax unicode.data compiler.units alien.syntax ; +unicode.syntax unicode.data compiler.units alien.syntax sets ; IN: unicode.breaks C-ENUM: Any L V T Extend Control CR LF graphemes ; @@ -27,7 +27,7 @@ CATEGORY: grapheme-control Zl Zp Cc Cf ; [ "#" split1 drop ";" split1 drop trim-blank ] map [ empty? not ] filter [ ".." split1 [ dup ] unless* [ hex> ] bi@ [a,b] ] map - concat [ dup ] H{ } map>assoc ; + concat unique ; : other-extend-lines ( -- lines ) "resource:extra/unicode/PropList.txt" ascii file-lines ;