[Sbcl-commits] CVS: sbcl/src/code reader.lisp,1.61,1.62

[Nikodemus S. <de...@us...>]

Update of /cvsroot/sbcl/sbcl/src/code
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30053/src/code

Modified Files:
	reader.lisp 
Log Message:
1.0.42.47: fix regressions from 1.0.42.46.

 ...need to learn read the test suite output properly...


Index: reader.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/reader.lisp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- reader.lisp	20 Sep 2010 07:33:24 -0000	1.61
+++ reader.lisp	20 Sep 2010 08:23:52 -0000	1.62
@@ -1577,7 +1577,7 @@
 
 (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 @@
                              (: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)