Steel Bank Common Lisp

Update of /cvsroot/sbcl/sbcl/tests
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv24494/tests

Modified Files:
	reader.pure.lisp 
Log Message:
1.0.34.3: Fix second return value of GET-MACRO-CHARACTER.

GET-MACRO-CHARACTER always refered to *READTABLE* when computing its
second return value (the non-terminating-p flag) rather than to the
readtable that may have been passed explicitly.


Index: reader.pure.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tests/reader.pure.lisp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- reader.pure.lisp	17 Sep 2007 18:38:17 -0000	1.16
+++ reader.pure.lisp	4 Jan 2010 15:55:21 -0000	1.17
@@ -245,3 +245,13 @@
       (read-from-string "CL-USER:DOES-NOT-EXIST")
     (reader-error (c)
       (princ c))))
+
+;;; The GET-MACRO-CHARACTER in SBCL <= "1.0.34.2" bogusly computed its
+;;; second return value relative to *READTABLE* rather than the passed
+;;; readtable.
+(let* ((*readtable* (copy-readtable nil)))
+  (set-syntax-from-char #\" #\A)
+  (multiple-value-bind (reader-fn non-terminating-p)
+      (get-macro-character #\" (copy-readtable nil))
+    (declare (ignore reader-fn))
+    (assert (not non-terminating-p))))
\ No newline at end of file

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

Modified Files:
	version.lisp-expr NEWS 
Log Message:
1.0.34.3: Fix second return value of GET-MACRO-CHARACTER.

GET-MACRO-CHARACTER always refered to *READTABLE* when computing its
second return value (the non-terminating-p flag) rather than to the
readtable that may have been passed explicitly.


Index: version.lisp-expr
===================================================================
RCS file: /cvsroot/sbcl/sbcl/version.lisp-expr,v
retrieving revision 1.4713
retrieving revision 1.4714
diff -u -d -r1.4713 -r1.4714
--- version.lisp-expr	30 Dec 2009 22:54:27 -0000	1.4713
+++ version.lisp-expr	4 Jan 2010 15:55:21 -0000	1.4714
@@ -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.34.2"
+"1.0.34.3"

Index: NEWS
===================================================================
RCS file: /cvsroot/sbcl/sbcl/NEWS,v
retrieving revision 1.1661
retrieving revision 1.1662
diff -u -d -r1.1661 -r1.1662
--- NEWS	30 Dec 2009 20:09:45 -0000	1.1661
+++ NEWS	4 Jan 2010 15:55:21 -0000	1.1662
@@ -1,4 +1,8 @@
 ;;;; -*- coding: utf-8; fill-column: 78 -*-
+changes relative to sbcl-1.0.34:
+  * bug fix: GET-MACRO-CHARACTER bogusly computed its second return value
+    always relative to *READTABLE* rather than the passed argument.
+
 changes in sbcl-1.0.34 relative to sbcl-1.0.33:
   * minor incompatible change: threading support is now enabled by default
     on x86[-64] Linux.

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

Modified Files:
	reader.lisp 
Log Message:
1.0.34.3: Fix second return value of GET-MACRO-CHARACTER.

GET-MACRO-CHARACTER always refered to *READTABLE* when computing its
second return value (the non-terminating-p flag) rather than to the
readtable that may have been passed explicitly.


Index: reader.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/reader.lisp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- reader.lisp	1 May 2009 21:01:57 -0000	1.59
+++ reader.lisp	4 Jan 2010 15:55:21 -0000	1.60
@@ -292,8 +292,8 @@
     (values fun-value
             ;; NON-TERMINATING-P return value:
             (if fun-value
-                (or (constituentp char)
-                    (not (terminating-macrop char)))
+                (or (constituentp char designated-readtable)
+                    (not (terminating-macrop char designated-readtable)))
                 ;; ANSI's definition of GET-MACRO-CHARACTER says this
                 ;; value is NIL when CHAR is not a macro character.
                 ;; I.e. this value means not just "non-terminating