Changeset 11764


Ignore:
Timestamp:
Feb 24, 2009, 1:54:44 AM (11 years ago)
Author:
gz
Message:

Reset *loading-file-source-file* and *loading-toplevel-location* to just before the non-local exit in level-1.lisp, don't bother resetting it earlier as it just gets overwritten.

Location:
branches/working-0711/ccl/level-1
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/working-0711/ccl/level-1/l1-boot-1.lisp

    r11074 r11764  
    114114
    115115(catch :toplevel
    116   (setq *loading-file-source-file* nil)  ;Reset from last %fasload...
    117116  (init-logical-directories)
    118117  )
  • branches/working-0711/ccl/level-1/l1-boot-2.lisp

    r11412 r11764  
    2727                                  (namestring (backend-target-fasl-pathname
    2828                                               *target-backend*)))))
    29        `(let* ((*loading-file-source-file* *loading-file-source-file*))
    30                  (%fasload ,namestring))))
     29               `(let* ((*loading-file-source-file* *loading-file-source-file*)
     30                       (*loading-toplevel-location* *loading-toplevel-location*))
     31                  (%fasload ,namestring))))
    3132           (bin-load (name)
    3233             (let* ((namestring
     
    3637                                  (namestring (backend-target-fasl-pathname
    3738                                               *target-backend*)))))
    38                `(let* ((*loading-file-source-file* *loading-file-source-file*))
     39               `(let* ((*loading-file-source-file* *loading-file-source-file*)
     40                       (*loading-toplevel-location* *loading-toplevel-location*))
    3941                 (%fasload ,namestring)))))
    4042
  • branches/working-0711/ccl/level-1/level-1.lisp

    r11101 r11764  
    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         *loading-toplevel-location* nil)
    10197  )
    10298
     
    106102  (%set-toplevel #'toplevel-loop)
    107103  (set-user-environment t)
     104  (setq *loading-file-source-file* nil
     105        *loading-toplevel-location* nil)
    108106  (toplevel))
Note: See TracChangeset for help on using the changeset viewer.