X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Freader.lisp;h=afc665095e9d236a8776cc09334d86e732bfec6f;hb=3f3033a6c0ddf0af8dd1b5a17c2a4b82ea59b94f;hp=77ab6f015795a6cd797555ba542283333acb38f6;hpb=2612849876e000af9b3c1f52cddb04cef0841f37;p=sbcl.git diff --git a/src/code/reader.lisp b/src/code/reader.lisp index 77ab6f0..afc6650 100644 --- a/src/code/reader.lisp +++ b/src/code/reader.lisp @@ -904,6 +904,8 @@ standard Lisp readtable when NIL." (cond (all-lower (raise-em)) (all-upper (lower-em)))))))))))) +(defvar *reader-package* nil) + (defun read-token (stream firstchar) #!+sb-doc "Default readmacro function. Handles numbers, symbols, and SBCL's @@ -1262,7 +1264,7 @@ extended :: syntax." (#.+char-attr-delimiter+ (unread-char char stream) (if package-designator - (let ((*package* (%find-package-or-lose package-designator))) + (let* ((*reader-package* (%find-package-or-lose package-designator))) (return (read stream t nil t))) (simple-reader-error stream "illegal terminating character after a double-colon: ~S" @@ -1278,7 +1280,7 @@ extended :: syntax." (casify-read-buffer escapes) (let ((found (if package-designator (%find-package-or-lose package-designator) - (sane-package)))) + (or *reader-package* (sane-package))))) (if (or (zerop colons) (= colons 2) (eq found *keyword-package*)) (return (intern* *read-buffer* *ouch-ptr* found)) (multiple-value-bind (symbol test)