Ignore:
Timestamp:
Dec 12, 2008, 6:15:09 PM (12 years ago)
Author:
gz
Message:

propagate r11502 to trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/level-1/l1-readloop.lisp

    r11040 r11514  
    495495        (if already
    496496          (setf (%cdr already) (combine-function-infos name (%cdr already) info))
    497           (let ((new (cons name info)))
    498             (if (listp defs)
    499               (setf (defenv.defined definition-env) (cons new defs))
    500               (setf (gethash name defs) new))))
     497          (let ((outer (loop for defer = (cdr (defenv.type definition-env))
     498                               then (deferred-warnings.parent defer)
     499                             while (typep defer 'deferred-warnings)
     500                             thereis (gethash name (deferred-warnings.defs defer)))))
     501            (when outer
     502              (setq info (combine-function-infos name (%cdr outer) info)))
     503            (let ((new (cons name info)))
     504              (if (listp defs)
     505                (setf (defenv.defined definition-env) (cons new defs))
     506                (setf (gethash name defs) new)))))
    501507        info))))
    502508
Note: See TracChangeset for help on using the changeset viewer.