From 8f13b0ffdbf972ba050291788f38ceeaa35a33cb Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 20 Dec 2021 16:24:48 -0600 Subject: [PATCH] factor: fix a few more errors --- basis/bootstrap/image/download/download.factor | 2 +- basis/unicode/collation/collation.factor | 2 +- basis/unicode/data/data.factor | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/basis/bootstrap/image/download/download.factor b/basis/bootstrap/image/download/download.factor index ccef1a0c12..39fc4ddd95 100644 --- 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 68a155fd5b..9e860cf03f 100644 --- 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 c5d3c4703c..875a310bc8 100644 --- 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> -- 2.34.1