[slime-cvs] CVS slime

[CVS User sboukarev]

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

Modified Files:
	ChangeLog swank.lisp 
Log Message:
swank.lisp(compile-file-output): Use
(make-pathname :directory dir :defaults (compile-file-pathname file))
instead of (compile-file-pathname file :output-file dir),
because the latter works differently on different implementations.
(fasl-pathname): Use the above function.


--- /project/slime/cvsroot/slime/ChangeLog	2009/12/16 09:24:12	1.1938
+++ /project/slime/cvsroot/slime/ChangeLog	2009/12/16 11:36:45	1.1939
@@ -1,3 +1,11 @@
+2009-12-16  Stas Boukarev  <stassats at gmail.com>
+
+	* swank.lisp (compile-file-output): Use
+	(make-pathname :directory dir :defaults (compile-file-pathname file))
+	instead of (compile-file-pathname file :output-file dir),
+	because the latter works differently on different implementations.
+	(fasl-pathname): Use the above function.
+
 2009-12-15  Tobias C. Rittweiler <tcr at freebits.de>
 
 	* swank.lisp (*sldb-quit-restart*): Export. For users to customize
--- /project/slime/cvsroot/slime/swank.lisp	2009/12/16 09:24:12	1.676
+++ /project/slime/cvsroot/slime/swank.lisp	2009/12/16 11:36:45	1.677
@@ -2765,10 +2765,10 @@
             (setq *sldb-stepping-p* t)
             (,backend-function-name))
            ((find-restart 'continue)
-         (activate-stepping frame)
-         (setq *sldb-stepping-p* t)
-         (continue))
-        (t
+            (activate-stepping frame)
+            (setq *sldb-stepping-p* t)
+            (continue))
+           (t
             (error "Not currently single-stepping, and no continue restart available.")))))
 
 (define-stepper-function sldb-step sldb-step-into)
@@ -2838,14 +2838,17 @@
 (defvar *fasl-pathname-function* nil
   "In non-nil, use this function to compute the name for fasl-files.")
 
+(defun compile-file-output (file directory)
+  (make-pathname :directory directory
+                 :defaults (compile-file-pathname file)))
+
 (defun fasl-pathname (input-file options)
   (cond (*fasl-pathname-function*
          (funcall *fasl-pathname-function* input-file options))
         ((getf options :fasl-directory)
-         (let* ((str (getf options :fasl-directory))
-                (dir (filename-to-pathname str)))
-           (assert (char= (aref str (1- (length str))) #\/))
-           (compile-file-pathname input-file :output-file dir)))
+         (let ((dir (getf options :fasl-directory)))
+           (assert (char= (aref dir (1- (length dir))) #\/))
+           (compile-file-output input-file dir)))
         (t
          (compile-file-pathname input-file))))