Fixing Unicode bootstrap issue (hopefully)

diff --git a/basis/bootstrap/unicode/unicode.factor b/basis/bootstrap/unicode/unicode.factor
index 1e9f8b864279dc9a50308642768f7f44f1766cc5..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/basis/bootstrap/unicode/unicode.factor
+++ b/basis/bootstrap/unicode/unicode.factor
@@ -1,5 +0,0 @@
-USING: strings.parser kernel namespaces unicode unicode.data ;
-IN: bootstrap.unicode
-
-[ name>char [ "Invalid character" throw ] unless* ]
-name>char-hook set-global

diff --git a/basis/unicode/case/case.factor b/basis/unicode/case/case.factor
index c800205704f66811372d96b3381743726c8b0626..773bbeed5fbe94ec12c08043d6a29dac4ccb10e9 100644 (file)
--- a/basis/unicode/case/case.factor
+++ b/basis/unicode/case/case.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: unicode.data sequences sequences.next namespaces make
+USING: unicode.data sequences sequences.next namespaces make unicode.syntax
 unicode.normalize math unicode.categories combinators unicode.syntax
 assocs strings splitting kernel accessors unicode.breaks fry ;
 IN: unicode.case

diff --git a/basis/unicode/data/data.factor b/basis/unicode/data/data.factor
index 6cf913bffa7290395b91c781157d977175fe555c..e78b4c104a81859c882d6c11ed9c4869ded2ccbe 100644 (file)
--- a/basis/unicode/data/data.factor
+++ b/basis/unicode/data/data.factor
@@ -4,7 +4,8 @@ USING: combinators.short-circuit assocs math kernel sequences
 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 io.encodings.utf8 ;
+ascii sets combinators locals math.ranges sorting make
+strings.parser io.encodings.utf8 ;
 IN: unicode.data
 
 VALUE: simple-lower
@@ -218,3 +219,6 @@ SYMBOL: interned
 
 : load-script ( filename -- table )
     ascii <file-reader> parse-script process-script ;
+
+[ name>char [ "Invalid character" throw ] unless* ]
+name>char-hook set-global