[slime-cvs] CVS slime

[CVS User nsiivola]

Update of /project/slime/cvsroot/slime
In directory cl-net:/tmp/cvs-serv30592

Modified Files:
	ChangeLog swank-source-path-parser.lisp 
Log Message:
guard agains source path mapping hitting reader errors

  Example: compile (defun foo () (bar)) in a file. Edit
  the definition to look like (defun foo () (nopackage:bar)),
  close the file and hit M-. foo. Prior to this an error shows
  in the minibuffer, and nothing else happens.



--- /project/slime/cvsroot/slime/ChangeLog	2009/05/19 09:51:54	1.1766
+++ /project/slime/cvsroot/slime/ChangeLog	2009/05/19 10:51:38	1.1767
@@ -1,3 +1,10 @@
+2009-05-19  Nikodemus Siivola  <nikodemus at random-state.net>
+
+	* swank-source-path-parser.lisp (read-and-record-source-map):
+	ignore errors during the call to READ, so that we don't the
+	current version of the form we are looking at contains eg.
+	uninternable symbols.
+
 2009-05-19  Helmut Eller  <heller at common-lisp.net>
 
 	* swank-openmcl.lisp (source-note-to-source-location): Always
--- /project/slime/cvsroot/slime/swank-source-path-parser.lisp	2009/01/08 06:45:19	1.21
+++ /project/slime/cvsroot/slime/swank-source-path-parser.lisp	2009/05/19 10:51:38	1.22
@@ -80,7 +80,7 @@
   (let* ((source-map (make-hash-table :test #'eq))
          (*readtable* (make-source-recording-readtable *readtable* source-map))
 	 (start (file-position stream))
-	 (form (read stream))
+	 (form (ignore-errors (read stream)))
 	 (end (file-position stream)))
     ;; ensure that at least FORM is in the source-map
     (unless (gethash form source-map)