factor: fix a few more errors

diff --git a/basis/bootstrap/image/download/download.factor b/basis/bootstrap/image/download/download.factor
index ccef1a0c128c2829fbf1b08bc8ba93464affd034..39fc4ddd957d16a00acef6d22a44c3038173aa6f 100644 (file)
--- a/basis/bootstrap/image/download/download.factor
+++ b/basis/bootstrap/image/download/download.factor
@@ -8,7 +8,7 @@ CONSTANT: url URL" http://downloads.factorcode.org/images/master/"
 
 : download-checksums ( -- alist )
     url "checksums.txt" >url derive-url http-get nip
-    lines [ " " split1 ] { } map>assoc ;
+    split-lines [ " " split1 ] { } map>assoc ;
 
 : file-checksum ( image -- checksum )
     md5 checksum-file bytes>hex-string ;

diff --git a/basis/unicode/collation/collation.factor b/basis/unicode/collation/collation.factor
index 68a155fd5b6a5011db06b052d49c3a0aea49d215..9e860cf03f5c505f15e4885ad58bfebc576afe1e 100644 (file)
--- a/basis/unicode/collation/collation.factor
+++ b/basis/unicode/collation/collation.factor
@@ -25,7 +25,7 @@ TUPLE: weight-levels primary secondary tertiary ignorable? ;
     ] map ;
 
 : parse-keys ( string -- chars )
-    words [ hex> ] "" map-as ;
+    split-words [ hex> ] "" map-as ;
 
 : parse-ducet ( file -- ducet )
     load-data-file [ [ parse-keys ] [ parse-weight ] bi* ] H{ } assoc-map-as ;

diff --git a/basis/unicode/data/data.factor b/basis/unicode/data/data.factor
index c5d3c4703c73b2f731051afba6b81ba5bd20d212..875a310bc88e68ef92236758421dc0d0670ab381 100644 (file)
--- a/basis/unicode/data/data.factor
+++ b/basis/unicode/data/data.factor
@@ -100,14 +100,14 @@ PRIVATE>
 
 : (process-decomposed) ( data -- alist )
     5 swap (process-data)
-    [ words [ hex> ] map ] assoc-map ;
+    [ split-words [ hex> ] map ] assoc-map ;
 
 : exclusions-file ( -- filename )
     "vocab:unicode/UCD/CompositionExclusions.txt" ;
 
 : exclusions ( -- set )
     exclusions-file utf8 file-lines
-    [ "#" split1 drop [ blank? ] trim-tail hex> ] map
+    [ "#" split1 drop [ ascii:blank? ] trim-tail hex> ] map
     [ 0 = ] reject ;
 
 : unique ( seq -- assoc )
@@ -157,7 +157,7 @@ PRIVATE>
     ] H{ } assoc-map-as ;
 
 : multihex ( hexstring -- string )
-    words [ hex> ] map sift ;
+    split-words [ hex> ] map sift ;
 
 PRIVATE>