Changeset 15013


Ignore:
Timestamp:
Oct 10, 2011, 9:09:20 PM (8 years ago)
Author:
gz
Message:

Only store *fcomp-stream-position* in compiler warnings if it's non-nil, make merge-compiler-warnings deal with the nil case. Fixes ticket:887.

Location:
trunk/source
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/compiler/nx-basic.lisp

    r14982 r15013  
    593593                                     (compiler-warning-source-note w1))))
    594594                    (let ((nrefs (compiler-warning-nrefs w1)))
    595                       (setf (compiler-warning-nrefs w1)
    596                             (cons (compiler-warning-source-note w)
    597                                   (or nrefs
    598                                       (list (compiler-warning-source-note w1)))))
     595                      (when (null nrefs)
     596                        (let ((s1 (compiler-warning-source-note w1)))
     597                          (when s1
     598                            (setq nrefs (list s1)))))
     599                      (let ((s (compiler-warning-source-note w)))
     600                        (when s (push s nrefs)))
     601                      (setf (compiler-warning-nrefs w1) nrefs)
    599602                      (return nil))))))
    600603          (push w warnings))))
  • trunk/source/lib/nfcomp.lisp

    r14869 r15013  
    11541154        (harsh *fasl-non-style-warnings-signalled-p*))
    11551155    (dolist (w warnings)
    1156       (unless (compiler-warning-source-note w)
     1156      (when (and (not (compiler-warning-source-note w)) *fcomp-stream-position*)
    11571157        (setf (compiler-warning-source-note w)
    11581158              (make-source-note :source nil
Note: See TracChangeset for help on using the changeset viewer.