From 7f305329a0e13ab85b8fabcc5e22613d6b16a8f2 Mon Sep 17 00:00:00 2001 From: rtoy <rtoy> Date: Wed, 22 Dec 2004 19:25:55 +0000 Subject: [PATCH] ANSI CL says when "*read-suppress* is true, read, read-preserving-whitespace, read-delimited-list, and read-from-string all return a primary value of nil. Make it so. We were returning a list of NILs previously. --- code/reader.lisp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/reader.lisp b/code/reader.lisp index fee5feda7..d963b684c 100644 --- a/code/reader.lisp +++ b/code/reader.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/reader.lisp,v 1.49 2004/10/22 16:42:02 rtoy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/reader.lisp,v 1.50 2004/12/22 19:25:55 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -563,7 +563,9 @@ (result (multiple-value-list (funcall macrofun stream char)))) ;; Repeat if macro returned nothing. - (if result (return (car result))))))))) + (if result (return (if *read-suppress* + nil + (car result)))))))))) (t (let ((*sharp-equal-alist* nil)) (read-preserving-whitespace-internal stream eof-errorp eof-value t))))) -- GitLab