From: Nikodemus Siivola Date: Mon, 20 Sep 2010 08:23:52 +0000 (+0000) Subject: 1.0.42.47: fix regressions from 1.0.42.46. X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=9cfc5c8e86d91ab491fb3d693ad28d972f3c1ac7;p=sbcl.git 1.0.42.47: fix regressions from 1.0.42.46. ...need to learn read the test suite output properly... --- diff --git a/src/code/reader.lisp b/src/code/reader.lisp index 7cdd79b..6ae6ce4 100644 --- a/src/code/reader.lisp +++ b/src/code/reader.lisp @@ -1577,7 +1577,7 @@ standard Lisp readtable when NIL." (define-compiler-macro read-from-string (&whole form string &rest args) ;; Check this at compile-time, and rewrite it so we're silent at runtime. - (destructuring-bind (&optional eof-error-p eof-value &rest keys) + (destructuring-bind (&optional (eof-error-p t) eof-value &rest keys) args (cond ((maybe-note-read-from-string-signature-issue eof-error-p) `(read-from-string ,string t ,eof-value ,@keys)) @@ -1598,7 +1598,7 @@ standard Lisp readtable when NIL." (:preserve-whitespace preserve-whitespace) (otherwise (return-from read-from-string form))))) - (when (assoc key seen) + (when (member key seen) (setf var (gensym "IGNORE")) (push var ignore)) (push key seen) diff --git a/version.lisp-expr b/version.lisp-expr index 62ccde6..bc23034 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.42.46" +"1.0.42.47"