[slime-cvs] CVS slime

[heller]

Update of /project/slime/cvsroot/slime
In directory clnet:/tmp/cvs-serv4185

Modified Files:
	ChangeLog swank-source-path-parser.lisp slime.el 
Log Message:
Fix source-path mapping for #+#.'(:and).
Patch by Luis Oliveira.

* swank-source-path-parser.lisp (make-source-recording-readtable):
don't suppress the #. reader macro.
(read-and-record-source-map): don't bind *read-eval* to nil.
(suppress-sharp-dot): unused, delete it.

* slime.el (test compile-defun): test with #+#.'(:and).




--- /project/slime/cvsroot/slime/ChangeLog	2008/01/21 11:51:07	1.1272
+++ /project/slime/cvsroot/slime/ChangeLog	2008/01/27 10:15:48	1.1273
@@ -1,3 +1,12 @@
+2008-01-22  Luís Oliveira  <loliveira at common-lisp.net>
+
+	* swank-source-path-parser.lisp (make-source-recording-readtable):
+	don't suppress the #. reader macro.
+	(read-and-record-source-map): don't bind *read-eval* to nil.
+	(suppress-sharp-dot): unused, delete it.
+
+	* slime.el (test compile-defun): test with #+#.'(:and).
+	
 2008-01-21  Helmut Eller  <heller at common-lisp.net>
 
 	* slime.el (sldb-mode): Don't throw to toplevel in the
--- /project/slime/cvsroot/slime/swank-source-path-parser.lisp	2006/06/25 08:33:16	1.17
+++ /project/slime/cvsroot/slime/swank-source-path-parser.lisp	2008/01/27 10:15:52	1.18
@@ -56,20 +56,8 @@
 	  (when fn
 	    (set-macro-character char (make-source-recorder fn source-map) 
 				 term tab)))))
-    (suppress-sharp-dot tab)
     tab))
 
-(defun suppress-sharp-dot (readtable)
-  (when (get-macro-character #\# readtable)
-    (let ((sharp-dot (get-dispatch-macro-character #\# #\. readtable)))
-      (set-dispatch-macro-character #\# #\. (lambda (&rest args)
-					      (let ((*read-suppress* t))
-						(apply sharp-dot args))
-					      (if *read-suppress*
-						  (values)
-						  (list (gensym "#."))))
-				    readtable))))
-
 (defun read-and-record-source-map (stream)
   "Read the next object from STREAM.
 Return the object together with a hashtable that maps
@@ -90,8 +78,7 @@
   (let ((*read-suppress* t))
     (dotimes (i n)
       (read stream)))
-  (let ((*read-suppress* nil)
-	(*read-eval* nil))
+  (let ((*read-suppress* nil))
     (read-and-record-source-map stream)))
   
 (defun source-path-stream-position (path stream)
--- /project/slime/cvsroot/slime/slime.el	2008/01/21 11:51:06	1.894
+++ /project/slime/cvsroot/slime/slime.el	2008/01/27 10:15:52	1.895
@@ -8623,7 +8623,10 @@
            (cl-user::bar))
         
         "
-       (cl-user::bar)))
+       (cl-user::bar))
+      ("(defun foo ()
+          #+#.'(:and) (/ 1 0))"
+       (/ 1 0)))
   (slime-check-top-level)    
   (with-temp-buffer 
     (lisp-mode)