use radix literals

[factor.git] / basis / unicode / data / data.factor

diff --git a/basis/unicode/data/data.factor b/basis/unicode/data/data.factor
index 345b03fa5c691362ebe42ba78fe1e90f78441139..a04e689b1799ed2ea9717c540b71b5e9513b5f69 100644 (file)
--- a/basis/unicode/data/data.factor
+++ b/basis/unicode/data/data.factor
@@ -58,7 +58,7 @@ CONSTANT: categories
 MEMO: categories-map ( -- hashtable )
     categories <enum> [ swap ] H{ } assoc-map-as ;
 
-CONSTANT: num-chars HEX: 2FA1E
+CONSTANT: num-chars 0x2FA1E
 
 PRIVATE>
 
@@ -68,9 +68,9 @@ PRIVATE>
     ! Cf = 26; Mn = 5; Cn = 29
     ! Use a compressed array instead?
     dup category-map ?nth [ ] [
-        dup HEX: E0001 HEX: E007F between?
+        dup 0xE0001 0xE007F between?
         [ drop 26 ] [
-            HEX: E0100 HEX: E01EF between?  5 29 ?
+            0xE0100 0xE01EF between?  5 29 ?
         ] if
     ] ?if ;
 
@@ -89,7 +89,7 @@ PRIVATE>
     [ [ hex> ] dip ] assoc-map ;
 
 : process-data ( index data -- hash )
-    (process-data) [ hex> ] assoc-map [ nip ] assoc-filter >hashtable ;
+    (process-data) [ hex> ] assoc-map [ nip ] H{ } assoc-filter-as ;
 
 : (chain-decomposed) ( hash value -- newvalue )
     [
@@ -116,7 +116,7 @@ PRIVATE>
     [ 0 = not ] filter ;
 
 : remove-exclusions ( alist -- alist )
-    exclusions [ dup ] H{ } map>assoc assoc-diff ;
+    exclusions unique assoc-diff ;
 
 : process-canonical ( data -- hash hash )
     (process-decomposed) [ first* ] filter