Changeset 11768


Ignore:
Timestamp:
Feb 24, 2009, 2:44:33 AM (10 years ago)
Author:
gz
Message:

Propagate r11762-r11764 to trunk

Location:
trunk/source
Files:
4 edited

Legend:

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

    r11373 r11768  
    114114
    115115(catch :toplevel
    116   (setq *loading-file-source-file* nil)  ;Reset from last %fasload...
    117   (setq *loading-toplevel-location* nil)
    118116  (init-logical-directories)
    119117  )
  • trunk/source/level-1/level-1.lisp

    r11373 r11768  
    9595  (l1-load "l1-boot-3")
    9696
    97   ;; Without this, forms from the -e command line parameter would run with
    98   ;; *loading-file-source-file* set to "l1-boot-3".
    99   (setq *loading-file-source-file* nil)
    100   (setq *loading-toplevel-location* nil)
    10197  )
    10298
     
    105101  (%set-toplevel #'toplevel-loop)
    106102  (set-user-environment t)
     103  (setq *loading-file-source-file* nil
     104        *loading-toplevel-location* nil)
    107105  (toplevel))
  • trunk/source/lib/nfcomp.lisp

    r11687 r11768  
    239239
    240240        (setq forms (fcomp-file src
    241                                 (or compile-file-original-truename orig-src)
     241                                (or compile-file-original-truename (namestring orig-src))
    242242                                compile-file-original-buffer-offset
    243243                                lexenv))
     
    459459           (*fcomp-toplevel-forms* nil)
    460460           (*fasl-eof-forms* nil)
    461            (*loading-file-source-file* (namestring orig-file))
     461           (*loading-file-source-file* orig-file)
    462462           (*fcomp-source-note-map* (and *save-source-locations*
    463463                                         (make-hash-table :test #'eq :shared nil)))
  • trunk/source/lib/source-files.lisp

    r11420 r11768  
    591591  "Returns a list of (TYPE . DEFINITION-SOURCE) for all the known definitions of NAME."
    592592  (let ((definitions ()))
    593     (loop for ((dt . full-name) last-source . nil)
    594             in (find-definition-sources name type-name)
     593    (loop for ((dt . full-name) . sources) in (find-definition-sources name type-name)
     594          as last-source = (find-if-not #'null sources)
    595595          do (when last-source
    596596               (push (list dt full-name last-source) definitions)))
     
    653653                                       (and x
    654654                                            y
     655                                            (or (stringp x) (pathnamep x))
     656                                            (or (stringp y) (pathnamep y))
    655657                                            (equal
    656658                                             (or (probe-file x) (full-pathname x))
Note: See TracChangeset for help on using the changeset viewer.