fix build with #!-SB-UNICODE

Don't build a hash table with high-codepoint characters as values under
those circumstances.

diff --git a/src/code/target-char.lisp b/src/code/target-char.lisp
index fdd7b9c..395a894 100644 (file)
--- a/src/code/target-char.lisp
+++ b/src/code/target-char.lisp
@@ -62,11 +62,13 @@
                                      (dpb (aref info (+ (* 4 j) 2))
                                           (byte 8 8)
                                           (aref info (+ (* 4 j) 3)))))))
-                    (dotimes (i (/ (length info) 12) table)
+                    #!+sb-unicode
+                    (dotimes (i (/ (length info) 12))
                       (setf (gethash (dpb (code (* 3 i)) (byte 21 21)
                                           (code (1+ (* 3 i))))
                                      table)
-                            (code-char (code (+ (* 3 i) 2))))))))
+                            (code-char (code (+ (* 3 i) 2)))))
+                    table)))
               (defun !character-database-cold-init ()
                 (setf **character-database** ,character-database))
               ,(with-open-file (stream (file "ucd-names" "lisp-expr")
@@ -836,10 +838,17 @@ character exists."
 
 (defun normalize-string (string &optional (form :nfd))
   (declare (type (member :nfd :nfkd :nfc :nfkc) form))
+  #!-sb-unicode
+  (etypecase string
+    ((array nil (*)) string)
+    (string
+     (ecase form
+       ((:nfc :nfkc) string)
+       ((:nfd :nfkd) (error "Cannot normalize to ~A form in #-SB-UNICODE builds" form)))))
+  #!+sb-unicode
   (etypecase string
-    #!+sb-unicode
     (base-string string)
-    ((or (array character (*)) #!-sb-unicode base-string)
+    ((array character (*))
      (ecase form
        ((:nfc)
         (canonically-compose (sort-combiners (decompose-string string))))

diff --git a/tests/unicode-normalization.impure.lisp b/tests/unicode-normalization.impure.lisp
index 7cd0fdd..e62fd93 100644 (file)
--- a/tests/unicode-normalization.impure.lisp
+++ b/tests/unicode-normalization.impure.lisp
@@ -1,3 +1,17 @@
+;;;; This software is part of the SBCL system. See the README file for
+;;;; more information.
+;;;;
+;;;; While most of SBCL is derived from the CMU CL system, the test
+;;;; files (like this one) were written from scratch after the fork
+;;;; from CMU CL.
+;;;;
+;;;; This software is in the public domain and is provided with
+;;;; absolutely no warranty. See the COPYING and CREDITS files for
+;;;; more information.
+
+;;; KLUDGE: eventually we will export NORMALIZE-STRING from somewhere.
+;;; Until we do, import it here so we can test it without putting ::
+;;; everywhere.
 (import 'sb-impl::normalize-string)
 
 (defun parse-one-line (line)