X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-char.lisp;h=68f3948bb2812e58db84ba9c4f4169b386d194ca;hb=9a241987c408980164f71237f7d840265302bbc1;hp=f8aef32ea2e3fe47a263e525f0a44357982b6e57;hpb=231721189e1e2431597dc013aaf5eee01bc41a51;p=sbcl.git diff --git a/src/code/target-char.lisp b/src/code/target-char.lisp index f8aef32..68f3948 100644 --- a/src/code/target-char.lisp +++ b/src/code/target-char.lisp @@ -32,75 +32,77 @@ (deftype char-code () `(integer 0 (,char-code-limit))) +;;; 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 (code-char ccode)))))) - `(defparameter *char-name-alist* ',(results) - #!+sb-doc - "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.")))) - (frob ((#x00 ("Null" "^@" "Nul")) - (#x01 ("^a" "Soh")) - (#x02 ("^b" "Stx")) - (#x03 ("^c" "Etx")) - (#x04 ("^d" "Eot")) - (#x05 ("^e" "Enq")) - (#x06 ("^f" "Ack")) - (#x07 ("Bell" "^g" "Bel")) - (#x08 ("Backspace" "^h" "Bs")) - (#x09 ("Tab" "^i" "Ht")) - (#x0A ("Newline" "Linefeed" "^j" "Lf" "Nl" )) + `(defparameter *char-name-alist* ',(results))))) + ;; 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")) - (#x0D ("Return" "^m" "Cr")) - (#x0E ("^n" "So")) - (#x0F ("^o" "Si")) - (#x10 ("^p" "Dle")) - (#x11 ("^q" "Dc1")) - (#x12 ("^r" "Dc2")) - (#x13 ("^s" "Dc3")) - (#x14 ("^t" "Dc4")) - (#x15 ("^u" "Nak")) - (#x16 ("^v" "Syn")) - (#x17 ("^w" "Etb")) - (#x18 ("^x" "Can")) - (#x19 ("^y" "Em")) - (#x1A ("^z" "Sub")) - (#x1B ("Escape" "^[" "Altmode" "Esc" "Alt")) - (#x1C ("^\\" "Fs")) - (#x1D ("^]" "Gs")) - (#x1E ("^^" "Rs")) - (#x1F ("^_" "Us")) - (#x20 ("Space" "Sp")) - (#x7f ("Rubout" "Delete" "Del"))))) + (#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"))))) ; *** See Note above. ;;;; accessor functions (defun char-code (char) #!+sb-doc - "Returns the integer code of CHAR." + "Return the integer code of CHAR." (etypecase char (base-char (char-code (truly-the base-char char))))) (defun char-int (char) #!+sb-doc - "Returns the integer code of CHAR. This is the same as char-code, as - CMU Common Lisp does not implement character bits or fonts." + "Return the integer code of CHAR. (In SBCL this is the same as CHAR-CODE, as + there are no character bits or fonts.)" (char-code char)) (defun code-char (code) #!+sb-doc - "Returns the character with the code CODE." + "Return the character with the code CODE." (declare (type char-code code)) (code-char code)) (defun character (object) #!+sb-doc - "Coerces its argument into a character object if possible. Accepts + "Coerce OBJECT into a CHARACTER if possible. Legal inputs are characters, strings and symbols of length 1." (flet ((do-error (control args) (error 'simple-type-error @@ -123,14 +125,13 @@ (defun char-name (char) #!+sb-doc - "Given a character object, char-name returns the name for that - object (a symbol)." + "Return the name (a STRING) for a CHARACTER object." (car (rassoc char *char-name-alist*))) (defun name-char (name) #!+sb-doc - "Given an argument acceptable to string, name-char returns a character - object whose name is that symbol, if one exists. Otherwise, () is returned." + "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))) ;;;; predicates @@ -235,14 +236,14 @@ (defun char= (character &rest more-characters) #!+sb-doc - "Returns T if all of its arguments are the same character." + "Return T if all of the arguments are the same character." (do ((clist more-characters (cdr clist))) ((atom clist) T) (unless (eq (car clist) character) (return nil)))) (defun char/= (character &rest more-characters) #!+sb-doc - "Returns T if no two of its arguments are the same character." + "Return T if no two of the arguments are the same character." (do* ((head character (car list)) (list more-characters (cdr list))) ((atom list) T) @@ -253,7 +254,7 @@ (defun char< (character &rest more-characters) #!+sb-doc - "Returns T if its arguments are in strictly increasing alphabetic order." + "Return T if the arguments are in strictly increasing alphabetic order." (do* ((c character (car list)) (list more-characters (cdr list))) ((atom list) T) @@ -263,7 +264,7 @@ (defun char> (character &rest more-characters) #!+sb-doc - "Returns T if its arguments are in strictly decreasing alphabetic order." + "Return T if the arguments are in strictly decreasing alphabetic order." (do* ((c character (car list)) (list more-characters (cdr list))) ((atom list) T) @@ -273,7 +274,7 @@ (defun char<= (character &rest more-characters) #!+sb-doc - "Returns T if its arguments are in strictly non-decreasing alphabetic order." + "Return T if the arguments are in strictly non-decreasing alphabetic order." (do* ((c character (car list)) (list more-characters (cdr list))) ((atom list) T) @@ -283,7 +284,7 @@ (defun char>= (character &rest more-characters) #!+sb-doc - "Returns T if its arguments are in strictly non-increasing alphabetic order." + "Return T if the arguments are in strictly non-increasing alphabetic order." (do* ((c character (car list)) (list more-characters (cdr list))) ((atom list) T) @@ -300,7 +301,7 @@ (defun char-equal (character &rest more-characters) #!+sb-doc - "Returns T if all of its arguments are the same character. + "Return T if all of the arguments are the same character. Font, bits, and case are ignored." (do ((clist more-characters (cdr clist))) ((atom clist) T) @@ -310,7 +311,7 @@ (defun char-not-equal (character &rest more-characters) #!+sb-doc - "Returns T if no two of its arguments are the same character. + "Return T if no two of the arguments are the same character. Font, bits, and case are ignored." (do* ((head character (car list)) (list more-characters (cdr list))) @@ -324,7 +325,7 @@ (defun char-lessp (character &rest more-characters) #!+sb-doc - "Returns T if its arguments are in strictly increasing alphabetic order. + "Return T if the arguments are in strictly increasing alphabetic order. Font, bits, and case are ignored." (do* ((c character (car list)) (list more-characters (cdr list))) @@ -335,7 +336,7 @@ (defun char-greaterp (character &rest more-characters) #!+sb-doc - "Returns T if its arguments are in strictly decreasing alphabetic order. + "Return T if the arguments are in strictly decreasing alphabetic order. Font, bits, and case are ignored." (do* ((c character (car list)) (list more-characters (cdr list))) @@ -346,7 +347,7 @@ (defun char-not-greaterp (character &rest more-characters) #!+sb-doc - "Returns T if its arguments are in strictly non-decreasing alphabetic order. + "Return T if the arguments are in strictly non-decreasing alphabetic order. Font, bits, and case are ignored." (do* ((c character (car list)) (list more-characters (cdr list))) @@ -357,7 +358,7 @@ (defun char-not-lessp (character &rest more-characters) #!+sb-doc - "Returns T if its arguments are in strictly non-increasing alphabetic order. + "Return T if the arguments are in strictly non-increasing alphabetic order. Font, bits, and case are ignored." (do* ((c character (car list)) (list more-characters (cdr list))) @@ -370,7 +371,7 @@ (defun char-upcase (char) #!+sb-doc - "Returns CHAR converted to upper-case if that is possible." + "Return CHAR converted to upper-case if that is possible." (declare (character char)) (if (lower-case-p char) (code-char (- (char-code char) 32)) @@ -378,7 +379,7 @@ (defun char-downcase (char) #!+sb-doc - "Returns CHAR converted to lower-case if that is possible." + "Return CHAR converted to lower-case if that is possible." (declare (character char)) (if (upper-case-p char) (code-char (+ (char-code char) 32))