X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-char.lisp;h=ad0f9ee0df697108ee81b981d8a53f08368f94d9;hb=d10b036b1d20e6cff820f72b69af2a06dc362327;hp=68b02d0ddb60f1aba7db41bc6fa16228d433625e;hpb=4898ef32c639b1c7f4ee13a5ba566ce6debd03e6;p=sbcl.git diff --git a/src/code/target-char.lisp b/src/code/target-char.lisp index 68b02d0..ad0f9ee 100644 --- a/src/code/target-char.lisp +++ b/src/code/target-char.lisp @@ -35,106 +35,140 @@ (defvar *character-database*) (declaim (type (simple-array (unsigned-byte 8) (*)) *character-database*)) +#!+sb-unicode +(progn + (defvar *unicode-character-name-database*) + (defvar *unicode-character-name-huffman-tree*)) + (macrolet ((frob () - (with-open-file (stream (merge-pathnames - (make-pathname - :directory - '(:relative :up :up "output") - :name "ucd" - :type "dat") - sb!xc:*compile-file-truename*) - :direction :input - :element-type '(unsigned-byte 8)) - (let* ((length (file-length stream)) - (array (make-array length - :element-type '(unsigned-byte 8)))) - (read-sequence array stream) - `(defun !character-database-cold-init () - (setq *character-database* ',array)))))) + (flet ((file (name type) + (merge-pathnames (make-pathname + :directory + '(:relative :up :up "output") + :name name :type type) + sb!xc:*compile-file-truename*))) + `(progn + ,(with-open-file (stream (file "ucd" "dat") + :direction :input + :element-type '(unsigned-byte 8)) + (let* ((length (file-length stream)) + (array (make-array + length :element-type '(unsigned-byte 8)))) + (read-sequence array stream) + `(defun !character-database-cold-init () + (setq *character-database* ',array)))) + ,(with-open-file (stream (file "ucd-names" "lisp-expr") + :direction :input + :element-type 'character) + (let ((names (make-hash-table))) + #!+sb-unicode + (loop + for code-point = (read stream nil nil) + for char-name = (string-upcase (read stream nil nil)) + while code-point + do (setf (gethash code-point names) char-name)) + (let ((tree + #!+sb-unicode + (make-huffman-tree + (let (list) + (maphash (lambda (code name) + (declare (ignore code)) + (push name list)) + names) + list))) + (code->name + (make-array (hash-table-count names) + :fill-pointer 0)) + (name->code nil)) + (maphash (lambda (code name) + (vector-push + (cons code (huffman-encode name tree)) + code->name)) + names) + (setf name->code + (sort (copy-seq code->name) #'< :key #'cdr)) + (setf code->name + (sort (copy-seq name->code) #'< :key #'car)) + (setf names nil) + `(defun !character-name-database-cold-init () + #!+sb-unicode + (setq *unicode-character-name-database* + (cons ',code->name ',name->code) + *unicode-character-name-huffman-tree* ',tree))))))))) (frob)) #+sb-xc-host (!character-database-cold-init) +#+sb-xc-host (!character-name-database-cold-init) -;;; This is the alist of (character-name . character) for characters -;;; with long names. The first name in this list for a given character -;;; is used on typeout and is the preferred form for input. -(macrolet ((frob (char-names-list) - (collect ((results)) - (dolist (code char-names-list) - (destructuring-bind (ccode names) code - (dolist (name names) - (results (cons name ccode))))) - `(defparameter *char-name-alist* - (mapcar (lambda (x) (cons (car x) (code-char (cdr x)))) - ',(results)))))) +(defparameter *base-char-name-alist* ;; Note: The *** markers here indicate character names which are ;; required by the ANSI specification of #'CHAR-NAME. For the others, ;; we prefer the ASCII standard name. - (frob ((#x00 ("Nul" "Null" "^@")) - (#x01 ("Soh" "^a")) - (#x02 ("Stx" "^b")) - (#x03 ("Etx" "^c")) - (#x04 ("Eot" "^d")) - (#x05 ("Enq" "^e")) - (#x06 ("Ack" "^f")) - (#x07 ("Bel" "Bell" "^g")) - (#x08 ("Backspace" "^h" "Bs")) ; *** See Note above. - (#x09 ("Tab" "^i" "Ht")) ; *** See Note above. - (#x0A ("Newline" "Linefeed" "^j" "Lf" "Nl" )) ; *** See Note above. - (#x0B ("Vt" "^k")) - (#x0C ("Page" "^l" "Form" "Formfeed" "Ff" "Np")) ; *** See Note above. - (#x0D ("Return" "^m" "Cr")) ; *** See Note above. - (#x0E ("So" "^n")) - (#x0F ("Si" "^o")) - (#x10 ("Dle" "^p")) - (#x11 ("Dc1" "^q")) - (#x12 ("Dc2" "^r")) - (#x13 ("Dc3" "^s")) - (#x14 ("Dc4" "^t")) - (#x15 ("Nak" "^u")) - (#x16 ("Syn" "^v")) - (#x17 ("Etb" "^w")) - (#x18 ("Can" "^x")) - (#x19 ("Em" "^y")) - (#x1A ("Sub" "^z")) - (#x1B ("Esc" "Escape" "^[" "Altmode" "Alt")) - (#x1C ("Fs" "^\\")) - (#x1D ("Gs" "^]")) - (#x1E ("Rs" "^^")) - (#x1F ("Us" "^_")) - (#x20 ("Space" "Sp")) ; *** See Note above. - (#x7f ("Rubout" "Delete" "Del")) - (#x80 ("C80")) - (#x81 ("C81")) - (#x82 ("Break-Permitted")) - (#x83 ("No-Break-Permitted")) - (#x84 ("C84")) - (#x85 ("Next-Line")) - (#x86 ("Start-Selected-Area")) - (#x87 ("End-Selected-Area")) - (#x88 ("Character-Tabulation-Set")) - (#x89 ("Character-Tabulation-With-Justification")) - (#x8A ("Line-Tabulation-Set")) - (#x8B ("Partial-Line-Forward")) - (#x8C ("Partial-Line-Backward")) - (#x8D ("Reverse-Linefeed")) - (#x8E ("Single-Shift-Two")) - (#x8F ("Single-Shift-Three")) - (#x90 ("Device-Control-String")) - (#x91 ("Private-Use-One")) - (#x92 ("Private-Use-Two")) - (#x93 ("Set-Transmit-State")) - (#x94 ("Cancel-Character")) - (#x95 ("Message-Waiting")) - (#x96 ("Start-Guarded-Area")) - (#x97 ("End-Guarded-Area")) - (#x98 ("Start-String")) - (#x99 ("C99")) - (#x9A ("Single-Character-Introducer")) - (#x9B ("Control-Sequence-Introducer")) - (#x9C ("String-Terminator")) - (#x9D ("Operating-System-Command")) - (#x9E ("Privacy-Message")) - (#x9F ("Application-Program-Command"))))) ; *** See Note above. + '((#x00 "Nul" "Null" "^@") + (#x01 "Soh" "^a") + (#x02 "Stx" "^b") + (#x03 "Etx" "^c") + (#x04 "Eot" "^d") + (#x05 "Enq" "^e") + (#x06 "Ack" "^f") + (#x07 "Bel" "Bell" "^g") + (#x08 "Backspace" "^h" "Bs") ; *** See Note above + (#x09 "Tab" "^i" "Ht") ; *** See Note above + (#x0A "Newline" "Linefeed" "^j" "Lf" "Nl") ; *** See Note above + (#x0B "Vt" "^k") + (#x0C "Page" "^l" "Form" "Formfeed" "Ff" "Np") ; *** See Note above + (#x0D "Return" "^m" "Cr") ; *** See Note above + (#x0E "So" "^n") + (#x0F "Si" "^o") + (#x10 "Dle" "^p") + (#x11 "Dc1" "^q") + (#x12 "Dc2" "^r") + (#x13 "Dc3" "^s") + (#x14 "Dc4" "^t") + (#x15 "Nak" "^u") + (#x16 "Syn" "^v") + (#x17 "Etb" "^w") + (#x18 "Can" "^x") + (#x19 "Em" "^y") + (#x1A "Sub" "^z") + (#x1B "Esc" "Escape" "^[" "Altmode" "Alt") + (#x1C "Fs" "^\\") + (#x1D "Gs" "^]") + (#x1E "Rs" "^^") + (#x1F "Us" "^_") + (#x20 "Space" "Sp") ; *** See Note above + (#x7f "Rubout" "Delete" "Del") + (#x80 "C80") + (#x81 "C81") + (#x82 "Break-Permitted") + (#x83 "No-Break-Permitted") + (#x84 "C84") + (#x85 "Next-Line") + (#x86 "Start-Selected-Area") + (#x87 "End-Selected-Area") + (#x88 "Character-Tabulation-Set") + (#x89 "Character-Tabulation-With-Justification") + (#x8A "Line-Tabulation-Set") + (#x8B "Partial-Line-Forward") + (#x8C "Partial-Line-Backward") + (#x8D "Reverse-Linefeed") + (#x8E "Single-Shift-Two") + (#x8F "Single-Shift-Three") + (#x90 "Device-Control-String") + (#x91 "Private-Use-One") + (#x92 "Private-Use-Two") + (#x93 "Set-Transmit-State") + (#x94 "Cancel-Character") + (#x95 "Message-Waiting") + (#x96 "Start-Guarded-Area") + (#x97 "End-Guarded-Area") + (#x98 "Start-String") + (#x99 "C99") + (#x9A "Single-Character-Introducer") + (#x9B "Control-Sequence-Introducer") + (#x9C "String-Terminator") + (#x9D "Operating-System-Command") + (#x9E "Privacy-Message") + (#x9F "Application-Program-Command"))) ; *** See Note above ;;;; accessor functions @@ -210,13 +244,50 @@ (defun char-name (char) #!+sb-doc "Return the name (a STRING) for a CHARACTER object." - (car (rassoc char *char-name-alist*))) + (let ((char-code (char-code char))) + (or (second (assoc char-code *base-char-name-alist*)) + #!+sb-unicode + (let ((h-code (cdr (binary-search char-code + (car *unicode-character-name-database*) + :key #'car)))) + (cond + (h-code + (huffman-decode h-code *unicode-character-name-huffman-tree*)) + ((< char-code #x10000) + (format nil "U~4,'0X" char-code)) + (t + (format nil "U~8,'0X" char-code))))))) (defun name-char (name) #!+sb-doc "Given an argument acceptable to STRING, NAME-CHAR returns a character whose name is that string, if one exists. Otherwise, NIL is returned." - (cdr (assoc (string name) *char-name-alist* :test #'string-equal))) + (or (let ((char-code (car (rassoc-if (lambda (names) + (member name names :test #'string-equal)) + *base-char-name-alist*)))) + (when char-code + (code-char char-code))) + #!+sb-unicode + (let ((encoding (huffman-encode (string-upcase name) + *unicode-character-name-huffman-tree*))) + (when encoding + (let* ((char-code + (car (binary-search encoding + (cdr *unicode-character-name-database*) + :key #'cdr))) + (name-string (string name)) + (name-length (length name-string))) + (cond + (char-code + (code-char char-code)) + ((and (or (= name-length 9) + (= name-length 5)) + (char-equal (char name-string 0) #\U) + (loop for i from 1 below name-length + always (digit-char-p (char name-string i) 16))) + (code-char (parse-integer name-string :start 1 :radix 16))) + (t + nil))))))) ;;;; predicates @@ -366,16 +437,21 @@ (ucd-value-1 ,ch) (char-code ,ch))))) +(defun two-arg-char-equal (c1 c2) + (= (equal-char-code c1) (equal-char-code c2))) + (defun char-equal (character &rest more-characters) #!+sb-doc "Return T if all of the arguments are the same character. Font, bits, and case are ignored." (do ((clist more-characters (cdr clist))) ((null clist) t) - (unless (= (equal-char-code (car clist)) - (equal-char-code character)) + (unless (two-arg-char-equal (car clist) character) (return nil)))) +(defun two-arg-char-not-equal (c1 c2) + (/= (equal-char-code c1) (equal-char-code c2))) + (defun char-not-equal (character &rest more-characters) #!+sb-doc "Return T if no two of the arguments are the same character. @@ -385,11 +461,13 @@ ((null list) t) (unless (do* ((l list (cdr l))) ((null l) t) - (if (= (equal-char-code head) - (equal-char-code (car l))) + (if (two-arg-char-equal head (car l)) (return nil))) (return nil)))) +(defun two-arg-char-lessp (c1 c2) + (< (equal-char-code c1) (equal-char-code c2))) + (defun char-lessp (character &rest more-characters) #!+sb-doc "Return T if the arguments are in strictly increasing alphabetic order. @@ -397,10 +475,12 @@ (do* ((c character (car list)) (list more-characters (cdr list))) ((null list) t) - (unless (< (equal-char-code c) - (equal-char-code (car list))) + (unless (two-arg-char-lessp c (car list)) (return nil)))) +(defun two-arg-char-greaterp (c1 c2) + (> (equal-char-code c1) (equal-char-code c2))) + (defun char-greaterp (character &rest more-characters) #!+sb-doc "Return T if the arguments are in strictly decreasing alphabetic order. @@ -408,10 +488,12 @@ (do* ((c character (car list)) (list more-characters (cdr list))) ((null list) t) - (unless (> (equal-char-code c) - (equal-char-code (car list))) + (unless (two-arg-char-greaterp c (car list)) (return nil)))) +(defun two-arg-char-not-greaterp (c1 c2) + (<= (equal-char-code c1) (equal-char-code c2))) + (defun char-not-greaterp (character &rest more-characters) #!+sb-doc "Return T if the arguments are in strictly non-decreasing alphabetic order. @@ -419,10 +501,12 @@ (do* ((c character (car list)) (list more-characters (cdr list))) ((null list) t) - (unless (<= (equal-char-code c) - (equal-char-code (car list))) + (unless (two-arg-char-not-greaterp c (car list)) (return nil)))) +(defun two-arg-char-not-lessp (c1 c2) + (>= (equal-char-code c1) (equal-char-code c2))) + (defun char-not-lessp (character &rest more-characters) #!+sb-doc "Return T if the arguments are in strictly non-increasing alphabetic order. @@ -430,8 +514,7 @@ (do* ((c character (car list)) (list more-characters (cdr list))) ((null list) t) - (unless (>= (equal-char-code c) - (equal-char-code (car list))) + (unless (two-arg-char-not-lessp c (car list)) (return nil)))) ;;;; miscellaneous functions