Changeset 15480

Timestamp:

11/03/20 07:40:42 (2 years ago)

Author:

Mark Evenson

Message:

New algorithim for COMPILE-FILE-PATHNAME
(Robert Munyer)

Fixes "Wrong file type returned by COMPILE-FILE-PATHNAME" (ticket
#476) and "COMPILE-FILE, COMPILE-FILE-PATHNAME disagree on output dir"
(not yet ticketed).

<https://abcl.org/trac/ticket/476>
<​https://mailman.common-lisp.net/pipermail/armedbear-devel/2020-November/004162.html>

File:

• trunk/abcl/src/org/armedbear/lisp/compile-file-pathname.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/compile-file-pathname.lisp

@@ -32 +32 @@
 (in-package #:system)
 
-;; Adapted from SBCL.
-(defun cfp-output-file-default (input-file)
-  (let* ((defaults (merge-pathnames input-file *default-pathname-defaults*))
-   (retyped (make-pathname :type *compile-file-type* :defaults defaults)))
-    retyped))
+(defun compile-file-pathname (input-file &key output-file &allow-other-keys)
+  (let ((defaults (make-pathname :type *compile-file-type*
+                                 :defaults (merge-pathnames input-file))))
+    (cond ((null output-file) defaults)
+          (t (merge-pathnames output-file defaults)))))
 
-(defun compile-file-pathname (input-file
-                              &key
-                              (output-file (cfp-output-file-default
-                                            input-file))
-                              &allow-other-keys)
-  (merge-pathnames output-file (merge-pathnames input-file) nil))