From 79f4c3de36b3c7d0d41497e2543d3ed6a135cb46 Mon Sep 17 00:00:00 2001 From: Stas Boukarev Date: Mon, 16 Sep 2013 23:53:30 +0400 Subject: [PATCH] Restore building of +sb-unicode with -sb-unicode. Some host definitions slipped in during cross-compilation. char-code-limit => sb!xc:char-code-limit. **character-primary-compositions** was initialized at xc-time, move it to cold init. Thanks to Christophe Rhodes for the latter. --- src/code/external-formats/enc-ucs.lisp | 8 ++--- src/code/external-formats/enc-utf.lisp | 8 ++--- src/code/target-char.lisp | 50 ++++++++++++++++++-------------- src/compiler/srctran.lisp | 2 +- 4 files changed, 37 insertions(+), 31 deletions(-) diff --git a/src/code/external-formats/enc-ucs.lisp b/src/code/external-formats/enc-ucs.lisp index 0cdcfff..86ba1f8 100644 --- a/src/code/external-formats/enc-ucs.lisp +++ b/src/code/external-formats/enc-ucs.lisp @@ -347,7 +347,7 @@ (dpb (cref 3) (byte 8 24) (dpb (cref 2) (byte 8 16) (dpb (cref 1) (byte 8 8) (cref 0)))))))) - (if (< code char-code-limit) + (if (< code sb!xc:char-code-limit) (code-char code) (decoding-error array pos (+ pos bytes) :ucs-4le 'octet-decoding-error pos)))) @@ -366,7 +366,7 @@ (dpb (cref 0) (byte 8 24) (dpb (cref 1) (byte 8 16) (dpb (cref 2) (byte 8 8) (cref 3)))))))) - (if (< code char-code-limit) + (if (< code sb!xc:char-code-limit) (code-char code) (decoding-error array pos (+ pos bytes) :ucs-4be 'octet-decoding-error pos))))))) @@ -422,7 +422,7 @@ (setf (sap-ref-32le sap tail) bits) 4 (let ((code (sap-ref-32le sap head))) - (if (< code char-code-limit) + (if (< code sb!xc:char-code-limit) (code-char code) (return-from decode-break-reason 4))) ucs-4le->string-aref @@ -434,7 +434,7 @@ (setf (sap-ref-32be sap tail) bits) 4 (let ((code (sap-ref-32be sap head))) - (if (< code char-code-limit) + (if (< code sb!xc:char-code-limit) (code-char code) (return-from decode-break-reason 4))) ucs-4be->string-aref diff --git a/src/code/external-formats/enc-utf.lisp b/src/code/external-formats/enc-utf.lisp index bb965c6..145de40 100644 --- a/src/code/external-formats/enc-utf.lisp +++ b/src/code/external-formats/enc-utf.lisp @@ -423,7 +423,7 @@ (dpb (cref 3) (byte 8 24) (dpb (cref 2) (byte 8 16) (dpb (cref 1) (byte 8 8) (cref 0)))))))) - (if (and (< code char-code-limit) + (if (and (< code sb!xc:char-code-limit) (not (utf-noncharacter-code-p code))) (code-char code) (decoding-error array pos (+ pos bytes) :utf-32le @@ -443,7 +443,7 @@ (dpb (cref 0) (byte 8 24) (dpb (cref 1) (byte 8 16) (dpb (cref 2) (byte 8 8) (cref 3)))))))) - (if (and (< code char-code-limit) + (if (and (< code sb!xc:char-code-limit) (not (utf-noncharacter-code-p code))) (code-char code) (decoding-error array pos (+ pos bytes) :utf-32be @@ -502,7 +502,7 @@ (setf (sap-ref-32le sap tail) bits)) 4 (let ((code (sap-ref-32le sap head))) - (if (and (< code char-code-limit) + (if (and (< code sb!xc:char-code-limit) (not (utf-noncharacter-code-p code))) (code-char code) (return-from decode-break-reason 4))) @@ -517,7 +517,7 @@ (setf (sap-ref-32be sap tail) bits)) 4 (let ((code (sap-ref-32be sap head))) - (if (and (< code char-code-limit) + (if (and (< code sb!xc:char-code-limit) (not (utf-noncharacter-code-p code))) (code-char code) (return-from decode-break-reason 4))) diff --git a/src/code/target-char.lisp b/src/code/target-char.lisp index 7cef881..aa52adb 100644 --- a/src/code/target-char.lisp +++ b/src/code/target-char.lisp @@ -19,7 +19,7 @@ (declaim (maybe-inline digit-char-p digit-weight)) (deftype char-code () - `(integer 0 (,char-code-limit))) + `(integer 0 (,sb!xc:char-code-limit))) #!+sb-unicode (progn @@ -45,32 +45,38 @@ array)))) (let ((character-database (read-ub8-vector (file "ucd" "dat"))) (decompositions (read-ub8-vector (file "decomp" "dat"))) - (long-decompositions (read-ub8-vector (file "ldecomp" "dat")))) + (long-decompositions (read-ub8-vector (file "ldecomp" "dat"))) + (primary-compositions (read-ub8-vector (file "comp" "dat")))) `(progn - (declaim (type (simple-array (unsigned-byte 8) (*)) **character-database** **character-decompositions** **character-long-decompositions**)) + (declaim (type (simple-array (unsigned-byte 8) (*)) + **character-database** + **character-decompositions** + **character-long-decompositions**)) (defglobal **character-database** ,character-database) (defglobal **character-decompositions** ,decompositions) (defglobal **character-long-decompositions** ,long-decompositions) - (defglobal **character-primary-compositions** - (let ((table (make-hash-table)) - (info ,(read-ub8-vector (file "comp" "dat")))) - (flet ((code (j) - (dpb (aref info (* 4 j)) - (byte 8 24) - (dpb (aref info (+ (* 4 j) 1)) - (byte 8 16) - (dpb (aref info (+ (* 4 j) 2)) - (byte 8 8) - (aref info (+ (* 4 j) 3))))))) - #!+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))))) - table))) + ;; KLUDGE: temporary value, fixed up in cold-load + (defglobal **character-primary-compositions** ,primary-compositions) (defun !character-database-cold-init () - (setf **character-database** ,character-database)) + (setf **character-database** ,character-database) + (setf **character-primary-compositions** + (let ((table (make-hash-table)) + (info ,primary-compositions)) + (flet ((code (j) + (dpb (aref info (* 4 j)) + (byte 8 24) + (dpb (aref info (+ (* 4 j) 1)) + (byte 8 16) + (dpb (aref info (+ (* 4 j) 2)) + (byte 8 8) + (aref info (+ (* 4 j) 3))))))) + #!+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))))) + table)))) ,(with-open-file (stream (file "ucd-names" "lisp-expr") :direction :input :element-type 'character) diff --git a/src/compiler/srctran.lisp b/src/compiler/srctran.lisp index 5d4a693..b09518a 100644 --- a/src/compiler/srctran.lisp +++ b/src/compiler/srctran.lisp @@ -2522,7 +2522,7 @@ `(mod ,base-char-code-limit))) (t (specifier-type - `(mod ,char-code-limit)))))) + `(mod ,sb!xc:char-code-limit)))))) (defoptimizer (code-char derive-type) ((code)) (let ((type (lvar-type code))) -- 1.7.10.4