Changeset 12114


Ignore:
Timestamp:
May 23, 2009, 10:18:25 PM (10 years ago)
Author:
gz
Message:

When merging warnings, remember source notes of all references

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

Legend:

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

    r12073 r12114  
    528528                             (eq (%car w-args)
    529529                                 (%car w1-args)))
    530                     (incf (compiler-warning-nrefs w1))
     530                    (let ((nrefs (compiler-warning-nrefs w1)))
     531                      #-BOOTSTRAPPED (when (eql nrefs 1) (setq nrefs nil))
     532                      (setf (compiler-warning-nrefs w1)
     533                            (cons (compiler-warning-source-note w)
     534                                  (or nrefs
     535                                      (list (compiler-warning-source-note w1))))))
    531536                    (return)))))
    532537          (push w warnings))))
     
    641646    ;(format stream ".")
    642647    (let ((nrefs (compiler-warning-nrefs condition)))
    643       (when (and nrefs (neq nrefs 1))
    644         (format stream " (~D references)" nrefs)))))
     648      #-BOOTSTRAPPED (when (eql nrefs 1) (setq nrefs nil))
     649      (when nrefs
     650        (format stream " (~D references)" (length nrefs))))))
    645651
    646652(defun environment-structref-info (name env)
  • branches/working-0711/ccl/level-1/l1-error-system.lisp

    r12077 r12114  
    6969   (warning-type :initarg :warning-type :reader compiler-warning-warning-type)
    7070   (args :initarg :args :reader compiler-warning-args)
    71    (nrefs :initform 1 :accessor compiler-warning-nrefs))
     71   (nrefs :initform () :accessor compiler-warning-nrefs))
    7272  (:report report-compiler-warning))
    7373
Note: See TracChangeset for help on using the changeset viewer.