Changeset 8681


Ignore:
Timestamp:
Mar 7, 2008, 6:20:54 AM (12 years ago)
Author:
gz
Message:

Hook up the source location stuff again

Location:
branches/working-0711/ccl
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/working-0711/ccl/compiler/nx.lisp

    r8672 r8681  
    196196   (let* ((*load-time-eval-token* load-time-eval-token)
    197197          (*nx-source-note-map* source-notes)
     198          (*nx1-source-note-map* (and *fasl-save-source-locations* *nx-source-note-map*))
    198199          (*nx-current-code-note* (and source-notes
    199200                                       *compile-code-coverage*
    200201                                       (nx-ensure-code-note definition nil function-note)))
    201           (*definition-source-note* (and *form-source-note-map* (gethash definition *form-source-note-map*)))
     202          (*definition-source-note* (and *fasl-save-source-locations*
     203                                         (or function-note
     204                                             (and *form-source-note-map* (gethash definition *form-source-note-map*)))))
    202205          (env (new-lexical-environment env)))
    203206     (setf (lexenv.variables env) 'barrier)
  • branches/working-0711/ccl/compiler/nx0.lisp

    r8674 r8681  
    12831283     (setf (afunc-parent p) q))
    12841284  (setf (afunc-name p) name)
     1285  (when *definition-source-note*
     1286    (setf (afunc-lfun-info p)
     1287          (list* 'function-source-note
     1288                 (source-note-for-%lfun-info *definition-source-note*)
     1289                 (afunc-lfun-info p))))
    12851290  (unless (lambda-expression-p lambda-form)
    12861291    (nx-error "~S is not a valid lambda expression." lambda-form))
     
    21562161
    21572162(defun record-form-to-nx1-transformation (form nx1)
    2158   (when (and *fasl-save-source-locations* (form-source-note form))
     2163  (when (and *nx1-source-note-map* (form-source-note form))
    21592164    (setf (gethash nx1 *nx1-source-note-map*) (form-source-note form))))
    21602165
    21612166(defun record-nx1-source-equivalent (original new)
    2162   (when (and *fasl-save-source-locations*
     2167  (when (and *nx1-source-note-map*
    21632168             (nx1-source-note original)
    21642169             (not (nx1-source-note new)))
     
    21672172
    21682173(defun record-form-source-equivalent (original new)
    2169   (when (and *fasl-save-source-locations*
     2174  (when (and *form-source-note-map*
    21702175             (form-source-note original)
    21712176             (not (form-source-note new)))
  • branches/working-0711/ccl/level-1/l1-reader.lisp

    r8646 r8681  
    30123012;;; we don't actually store source-note structs in the fasl since that runs into problems dumping
    30133013;;; the struct.
    3014 (defun source-note-for-%lfun-info (note &key (start t) (end t) (text t) (form t) (parent-note t) (file-name t))
     3014(defun source-note-for-%lfun-info (note &key (start t) (end t) (text t) (form nil) (parent-note nil) (file-name t))
    30153015  (append (when start (list :start (source-note-start-pos note)))
    30163016          (when end   (list :end  (source-note-end-pos note)))
  • branches/working-0711/ccl/lib/nfcomp.lisp

    r8646 r8681  
    409409           (*fcomp-toplevel-forms* '())
    410410           (*loading-file-source-file* (namestring orig-file)) ; why orig-file???
    411            (*fcomp-source-note-map* (and (or *save-source-locations* *record-pc-mapping* *compile-code-coverage*)
     411           (*fcomp-source-note-map* (and (or *fasl-save-source-locations* *compile-code-coverage*)
    412412                                         (make-hash-table :test #'eq :shared nil)))
     413           (*form-source-note-map* (and *fasl-save-source-locations* *fcomp-source-note-map*))
    413414           (*fcomp-source-being-compiled* nil)
    414415           (eofval (cons nil nil))
     
    443444                                           :file-name (or *compile-file-original-truename* *loading-file-source-file*)
    444445                                           :start-offset (or *compile-file-original-buffer-offset* 0)
    445                                            :map (or *fcomp-source-note-map* (and *fasl-save-source-locations* t)))))))
     446                                           :map *fcomp-source-note-map*)))))
    446447            (when (eq eofval form)
    447448              (require-type *fcomp-source-being-compiled* 'null)
Note: See TracChangeset for help on using the changeset viewer.