Changeset 11988 for trunk/source/level-1


Ignore:
Timestamp:
May 1, 2009, 3:15:57 AM (10 years ago)
Author:
gb
Message:

Try to get FIND-LOAD-FILE - which is responsible for setting up
*LOAD-TRUENAME*,*LOAD-PATHNAME*, and CCL::*LOADING-FILE-SOURCE-FILE* -
right.
Hopefully fixes ticket:463 without breaking anything else.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/level-1/l1-files.lisp

    r11901 r11988  
    11691169        (kind nil))
    11701170    (when full-name
    1171       (let ((file-type (pathname-type full-name)))
     1171      (let ((file-type (pathname-type full-name))
     1172            (merged (pathname (merge-pathnames file-name))))
    11721173        (if (and file-type (neq file-type :unspecific))
    1173           (values (probe-file full-name) file-name (if (eq (pathname-host file-name) :unspecific) full-name file-name))
     1174          (values (probe-file full-name) merged (if (eq (pathname-host file-name) :unspecific) full-name file-name))
    11741175          (let* ((source (merge-pathnames file-name *.lisp-pathname*))
    11751176                 (fasl   (merge-pathnames file-name *.fasl-pathname*))
     
    11771178                 (true-fasl   (probe-file fasl)))
    11781179            (cond (true-source
    1179                    (when (eq (pathname-host file-name) :unspecific) ;; if physical pathname to begin with, force absolute
    1180                      (setq source full-name))
    11811180                   (if (and true-fasl
    11821181                            (> (file-write-date true-fasl)
    11831182                               (file-write-date true-source)))
    1184                      (values true-fasl fasl source)
    1185                      (values true-source source source)))
     1183                     (values true-fasl merged source)
     1184                     (values true-source merged source)))
    11861185                  (true-fasl
    1187                    (values true-fasl fasl fasl))
     1186                   (values true-fasl merged fasl))
    11881187                  ((and (multiple-value-setq (full-name kind)
    11891188                          (let* ((realpath (%realpath (native-translated-namestring full-name))))
     
    11911190                              (%probe-file-x realpath ))))
    11921191                        (eq kind :file))
    1193                    (values full-name file-name file-name)))))))))
     1192                   (values full-name merged file-name)))))))))
    11941193
    11951194
Note: See TracChangeset for help on using the changeset viewer.