Skip to content
Browse files

* swank-ecl.lisp (source-location): Move call to

	TRANSLATE-LOGICAL-PATHNAME from here into MAKE-FILE-LOCATION
	because locations-via-annotations may now also involve logical
	pathnames.
  • Loading branch information...
1 parent bdb6681 commit bcf2fbb8e96821f5957cde812602c47db9a178d8 @trittweiler trittweiler committed Mar 11, 2010
Showing with 11 additions and 4 deletions.
  1. +7 −0 ChangeLog
  2. +4 −4 swank-ecl.lisp
View
7 ChangeLog
@@ -1,5 +1,12 @@
2010-03-10 Tobias C. Rittweiler <tcr@freebits.de>
+ * swank-ecl.lisp (source-location): Move call to
+ TRANSLATE-LOGICAL-PATHNAME from here into MAKE-FILE-LOCATION
+ because locations-via-annotations may now also involve logical
+ pathnames.
+
+2010-03-10 Tobias C. Rittweiler <tcr@freebits.de>
+
* swank-ecl.lisp (*original-sigint-handler*)
(install-sigint-handler): Deleted; we directly implement
call-with-user-break-handler instead.
View
8 swank-ecl.lisp
@@ -249,8 +249,8 @@
(defun note-buffer-tmpfile (tmp-file buffer-name)
;; EXT:COMPILED-FUNCTION-FILE below will return a namestring.
(let ((tmp-namestring (namestring (truename tmp-file))))
- (setf (gethash tmp-namestring *tmpfile-map*) buffer-name))
- tmp-file)
+ (setf (gethash tmp-namestring *tmpfile-map*) buffer-name)
+ tmp-namestring))
(defun tmpfile-to-buffer (tmp-file)
(gethash tmp-file *tmpfile-map*))
@@ -497,7 +497,7 @@
;; start at 1. We specify (:ALIGN T) because the positions comming
;; from ECL point at right after the toplevel form appearing before
;; the actual target toplevel form; (:ALIGN T) will DTRT in that case.
- (make-location `(:file ,(namestring file))
+ (make-location `(:file ,(namestring (translate-logical-pathname file)))
`(:position ,(1+ file-position))
`(:align t)))
@@ -616,7 +616,7 @@
(t
(assert (probe-file file))
(assert (not (minusp pos)))
- (make-file-location (translate-logical-pathname file) pos)))))
+ (make-file-location file pos)))))
(method
;; FIXME: This will always return NIL at the moment; ECL does not
;; store debug information for methods yet.

0 comments on commit bcf2fbb

Please sign in to comment.
Something went wrong with that request. Please try again.