Changeset 11514 for trunk/source/level-1/sysutils.lisp

Timestamp:

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

Author:

gz

Message:

propagate r11502 to trunk

File:

• trunk/source/level-1/sysutils.lisp (modified) (2 diffs)

trunk/source/level-1/sysutils.lisp

@@ -537 +537 @@
             (unless override parent)
             nil
-            (if (or override (not parent))
-              (make-hash-table :test #'eq)
-              (deferred-warnings.defs parent))
+            (make-hash-table :test #'eq)
             flags))
 
@@ -546 +544 @@
          (parent (deferred-warnings.parent current))
          (warnings (deferred-warnings.warnings current))
+         (defs (deferred-warnings.defs current))
          (any nil)
          (harsh nil))
     (if parent
-      (setf (deferred-warnings.warnings parent) (append warnings (deferred-warnings.warnings parent))
-            parent t)
+      (let ((parent-defs (deferred-warnings.defs parent))
+            (parent-warnings (deferred-warnings.warnings parent)))
+        (maphash (lambda (key val) (setf (gethash key parent-defs) val)) defs)
+        (setf (deferred-warnings.warnings parent) (append warnings parent-warnings)
+              parent t))
       (let* ((file nil)
-             (defs (deferred-warnings.defs current))
              (init t))
         (flet ((signal-warning (w)