[armedbear-cvs] r13295 - trunk/abcl/src/org/armedbear/lisp

mevenson at common-lisp.net mevenson at common-lisp.net
Sat Jun 4 20:26:32 UTC 2011


Author: mevenson
Date: Wed May 25 07:31:50 2011
New Revision: 13295

Log:
Fix COMPILE-FILE to use paths that have a printable representation.

Modified:
   trunk/abcl/src/org/armedbear/lisp/compile-file.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/compile-file.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/compile-file.lisp	Tue May 24 05:25:55 2011	(r13294)
+++ trunk/abcl/src/org/armedbear/lisp/compile-file.lisp	Wed May 25 07:31:50 2011	(r13295)
@@ -523,9 +523,12 @@
     (let ((pathname (merge-pathnames (make-pathname :type "lisp") input-file)))
       (when (probe-file pathname)
         (setf input-file pathname))))
-  (setf output-file (if output-file
-                        (merge-pathnames output-file *default-pathname-defaults*)
-                        (compile-file-pathname input-file)))
+  (setf output-file (make-pathname 
+		     :defaults (if output-file
+				   (merge-pathnames output-file 
+						    *default-pathname-defaults*)
+				   (compile-file-pathname input-file))
+		     :version nil))
   (let* ((*output-file-pathname* output-file)
          (type (pathname-type output-file))
          (temp-file (merge-pathnames (make-pathname :type (concatenate 'string type "-tmp"))
@@ -535,7 +538,8 @@
          (warnings-p nil)
          (failure-p nil))
     (with-open-file (in input-file :direction :input)
-      (let* ((*compile-file-pathname* (pathname in))
+      (let* ((*compile-file-pathname* (make-pathname :defaults (pathname in)
+						     :version nil))
              (*compile-file-truename* (make-pathname :defaults (truename in)
                                                      :version nil))
              (*source* *compile-file-truename*)




More information about the armedbear-cvs mailing list