From 4a79ee9bb92adac7f9d3b118c92dcc97e1e297a1 Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <littledan@Macintosh-122.local>
Date: Tue, 17 Mar 2009 00:04:27 -0500
Subject: [PATCH] Making unicode.data slightly more efficient
---
basis/unicode/data/data.factor | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/basis/unicode/data/data.factor b/basis/unicode/data/data.factor
index bff4ddeaab..74914e8537 100644
--- a/basis/unicode/data/data.factor
+++ b/basis/unicode/data/data.factor
@@ -5,7 +5,7 @@ io.files hashtables quotations splitting grouping arrays io
math.parser hash2 math.order byte-arrays words namespaces words
compiler.units parser io.encodings.ascii values interval-maps
ascii sets combinators locals math.ranges sorting make
-strings.parser io.encodings.utf8 ;
+strings.parser io.encodings.utf8 memoize ;
IN: unicode.data
VALUE: simple-lower
@@ -108,6 +108,9 @@ CONSTANT: categories
"Zs" "Zl" "Zp"
"Cc" "Cf" "Cs" "Co" }
+MEMO: categories-map ( -- hashtable )
+ categories <enum> [ swap ] H{ } assoc-map-as ;
+
CONSTANT: num-chars HEX: 2FA1E
! the maximum unicode char in the first 3 planes
@@ -124,10 +127,10 @@ CONSTANT: num-chars HEX: 2FA1E
] assoc-each table ;
:: process-category ( data -- category-listing )
- [let | table [ num-chars <byte-array> ] |
- 2 data (process-data) [| char cat |
- cat categories index char table ?set-nth
- ] assoc-each table fill-ranges ] ;
+ num-chars <byte-array> :> table
+ 2 data (process-data) [| char cat |
+ cat categories-map at char table ?set-nth
+ ] assoc-each table fill-ranges ;
: process-names ( data -- names-hash )
1 swap (process-data) [