Changeset 11514 for trunk/source/level-1/l1-readloop.lisp

Timestamp:

Dec 12, 2008, 6:15:09 PM (12 years ago)

Author:

gz

Message:

propagate r11502 to trunk

File:

• trunk/source/level-1/l1-readloop.lisp (modified) (1 diff)

trunk/source/level-1/l1-readloop.lisp

@@ -495 +495 @@
         (if already
           (setf (%cdr already) (combine-function-infos name (%cdr already) info))
-          (let ((new (cons name info)))
-            (if (listp defs)
-              (setf (defenv.defined definition-env) (cons new defs))
-              (setf (gethash name defs) new))))
+          (let ((outer (loop for defer = (cdr (defenv.type definition-env))
+                               then (deferred-warnings.parent defer)
+                             while (typep defer 'deferred-warnings)
+                             thereis (gethash name (deferred-warnings.defs defer)))))
+            (when outer
+              (setq info (combine-function-infos name (%cdr outer) info)))
+            (let ((new (cons name info)))
+              (if (listp defs)
+                (setf (defenv.defined definition-env) (cons new defs))
+                (setf (gethash name defs) new)))))
         info))))