Changeset 12220


Ignore:
Timestamp:
Jun 7, 2009, 2:20:15 PM (10 years ago)
Author:
gz
Message:

From r12114: remember merged source notes, for slime's benefit.

Location:
trunk/source
Files:
2 edited

Legend:

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

    r12219 r12220  
    527527                             (eq (%car w-args)
    528528                                 (%car w1-args)))
    529                     (incf (compiler-warning-nrefs w1))
     529                    (let ((nrefs (compiler-warning-nrefs w1)))
     530                      #-BOOTSTRAPPED (when (eql nrefs 1) (setq nrefs nil))
     531                      (setf (compiler-warning-nrefs w1)
     532                            (cons (compiler-warning-source-note w)
     533                                  (or nrefs
     534                                      (list (compiler-warning-source-note w1))))))
    530535                    (return)))))
    531536          (push w warnings))))
     
    640645    ;(format stream ".")
    641646    (let ((nrefs (compiler-warning-nrefs condition)))
    642       (when (and nrefs (neq nrefs 1))
    643         (format stream " (~D references)" nrefs)))))
     647      #-BOOTSTRAPPED (when (eql nrefs 1) (setq nrefs nil))
     648      (when nrefs
     649        (format stream " (~D references)" (length nrefs))))))
    644650
    645651(defun environment-structref-info (name env)
  • trunk/source/level-1/l1-error-system.lisp

    r12219 r12220  
    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.