X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fsharpm.lisp;h=e03e1a359c1d2e978c99a9d8f6cc134e001b2506;hb=83fd554b67913275d8dc06edcad8b2f065c89c49;hp=1a9112a2060b3de626bd2c770d7df4673b1f3ec8;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git diff --git a/src/code/sharpm.lisp b/src/code/sharpm.lisp index 1a9112a..e03e1a3 100644 --- a/src/code/sharpm.lisp +++ b/src/code/sharpm.lisp @@ -8,9 +8,6 @@ ;;;; files for more information. (in-package "SB!IMPL") - -(file-comment - "$Header$") (declaim (special *read-suppress* *standard-readtable* *bq-vector-flag*)) @@ -218,19 +215,21 @@ tree) (t tree))) -;;; Sharp-equal works as follows. When a label is assigned (ie when #= is -;;; called) we GENSYM a symbol is which is used as an unforgeable tag. -;;; *SHARP-SHARP-ALIST* maps the integer tag to this gensym. +;;; Sharp-equal works as follows. When a label is assigned (i.e. when +;;; #= is called) we GENSYM a symbol is which is used as an +;;; unforgeable tag. *SHARP-SHARP-ALIST* maps the integer tag to this +;;; gensym. ;;; -;;; When SHARP-SHARP encounters a reference to a label, it returns the symbol -;;; assoc'd with the label. Resolution of the reference is deferred until the -;;; read done by #= finishes. Any already resolved tags (in -;;; *SHARP-EQUAL-ALIST*) are simply returned. +;;; When SHARP-SHARP encounters a reference to a label, it returns the +;;; symbol assoc'd with the label. Resolution of the reference is +;;; deferred until the read done by #= finishes. Any already resolved +;;; tags (in *SHARP-EQUAL-ALIST*) are simply returned. ;;; ;;; After reading of the #= form is completed, we add an entry to -;;; *SHARP-EQUAL-ALIST* that maps the gensym tag to the resolved object. Then -;;; for each entry in the *SHARP-SHARP-ALIST, the current object is searched -;;; and any uses of the gensysm token are replaced with the actual value. +;;; *SHARP-EQUAL-ALIST* that maps the gensym tag to the resolved +;;; object. Then for each entry in the *SHARP-SHARP-ALIST, the current +;;; object is searched and any uses of the gensysm token are replaced +;;; with the actual value. (defvar *sharp-sharp-alist* ()) (defun sharp-equal (stream ignore label) @@ -301,17 +300,14 @@ (defun sharp-backslash (stream backslash numarg) (ignore-numarg backslash numarg) - (unread-char backslash stream) - (let* ((*readtable* *standard-readtable*) - (charstring (read-extended-token stream))) + (let ((charstring (read-extended-token-escaped stream))) (declare (simple-string charstring)) (cond (*read-suppress* nil) ((= (the fixnum (length charstring)) 1) (char charstring 0)) ((name-char charstring)) (t - (%reader-error stream - "unrecognized character name: ~S" + (%reader-error stream "unrecognized character name: ~S" charstring))))) (defun sharp-vertical-bar (stream sub-char numarg)