[slime-cvs] CVS slime

[CVS User heller]

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

Modified Files:
	ChangeLog swank-allegro.lisp 
Log Message:
(ldb-code-to-src-loc): Don't use *temp-file-map* before it is declared.

--- /project/slime/cvsroot/slime/ChangeLog	2010/03/09 08:02:37	1.2028
+++ /project/slime/cvsroot/slime/ChangeLog	2010/03/09 08:15:05	1.2029
@@ -8,6 +8,8 @@
 	(fspec-definition-locations): For :top-level-forms return a list
 	of ((fspec loc)) not just (fspec loc).  Also deal with the file
 	vs. buffer issue.
+	(ldb-code-to-src-loc): Don't use *temp-file-map* before it is
+	declared.
 
 2010-03-08  Stas Boukarev  <stassats at gmail.com>
 
--- /project/slime/cvsroot/slime/swank-allegro.lisp	2010/03/09 08:02:37	1.137
+++ /project/slime/cvsroot/slime/swank-allegro.lisp	2010/03/09 08:15:05	1.138
@@ -236,18 +236,17 @@
                   (paths (source-paths-of (excl::ldb-code-source whole)
                                           (excl::ldb-code-source code)))
                   (path (longest-common-prefix paths))
-                  (start (excl::ldb-code-start-char whole))
-                  (probe (gethash src-file *temp-file-map*)))
-             (cond ((not probe)
-                    (make-location `(:file ,(namestring (truename src-file)))
-                                   `(:source-path (0 . ,path) ,start)))
-                   (t
-                    (destructuring-bind (buffer bstart file) probe
-                      (declare (ignore file))
-                      (make-location `(:buffer ,buffer)
-                                     `(:source-path (0 . ,path) 
-                                                    ,(+ bstart start)))))))))))
-
+                  (start (excl::ldb-code-start-char whole)))
+             (buffer-or-file 
+              src-file 
+              (lambda (file) 
+                (make-location `(:file ,file) 
+                               `(:source-path (0 . ,path) ,start)))
+              (lambda (buffer bstart)
+                (make-location `(:buffer ,buffer)
+                               `(:source-path (0 . ,path)
+                                              ,(+ bstart start))))))))))
+ 
 (defun longest-common-prefix (sequences)
   (assert sequences)
   (flet ((common-prefix (s1 s2)