0.7.7.13:

[sbcl.git] / src / code / target-load.lisp

diff --git a/src/code/target-load.lisp b/src/code/target-load.lisp
index 9254a35..11de3e3 100644 (file)
--- a/src/code/target-load.lisp
+++ b/src/code/target-load.lisp
@@ -42,7 +42,8 @@
 \f
 ;;;; LOAD itself
 
-;;; a helper function for LOAD: Load the stuff in a file when we have the name.
+;;; a helper function for LOAD: Load the stuff in a file when we have
+;;; the name.
 (defun internal-load (pathname truename if-does-not-exist verbose print
                      &optional contents)
   (declare (type (member nil :error) if-does-not-exist))
@@ -96,7 +97,7 @@
 ;;; possible types are ".lisp" and ".cl", and both "foo.lisp" and
 ;;; "foo.cl" exist?)
 (defun try-default-type (pathname type)
-  (let ((pn (make-pathname :type type :defaults pathname)))
+  (let ((pn (translate-logical-pathname (make-pathname :type type :defaults pathname))))
     (values pn (probe-file pn))))
 
 ;;; a helper function for LOAD: Handle the case of INTERNAL-LOAD where
@@ -183,40 +184,20 @@
                        '(unsigned-byte 8)))
             (load-as-fasl filespec verbose print)
             (load-as-source filespec verbose print))
-        (let (;; FIXME: MERGE-PATHNAMES doesn't work here for
-              ;; FILESPEC="TEST:Load-Test" and
-              ;; (LOGICAL-PATHNAME-TRANSLATIONS "TEST")
-              ;;   = (("**;*.*.*" "/foo/bar/**/*.*")).
-              ;; Physicalizing the pathname before merging 
-              ;; is a workaround, but the ANSI spec talks about
-              ;; MERGE-PATHNAMES accepting (and returning)
-              ;; logical pathnames, so a true fix would probably
-              ;; include fixing MERGE-PATHNAMES, then probably
-              ;; revisiting this code.
-              (ppn (physicalize-pathname (pathname filespec))))
-          (if (wild-pathname-p ppn)
-              (let ((files (directory ppn)))
-                #!+high-security
-                (when (null files)
-                  (error 'file-error :pathname filespec))
-                (dolist (file files t)
-                  (internal-load ppn
-                                 file
-                                 internal-if-does-not-exist
-                                 verbose
-                                 print)))
-              (let ((tn (probe-file ppn)))
-                (if (or tn (pathname-type ppn))
-                    (internal-load ppn
-                                   tn
-                                   internal-if-does-not-exist
-                                   verbose
-                                   print)
-                    (internal-load-default-type
-                     ppn
-                     internal-if-does-not-exist
-                     verbose
-                     print)))))))))
+        (let* ((pathname (pathname filespec))
+               (physical-pathname (translate-logical-pathname pathname))
+               (probed-file (probe-file physical-pathname)))
+          (if (or probed-file
+                  (pathname-type physical-pathname))
+              (internal-load physical-pathname
+                             probed-file
+                             internal-if-does-not-exist
+                             verbose
+                             print)
+              (internal-load-default-type pathname
+                                          internal-if-does-not-exist
+                                          verbose
+                                          print)))))))
 \f
 ;;; Load a code object. BOX-NUM objects are popped off the stack for
 ;;; the boxed storage section, then SIZE bytes of code are read in.