Changeset 12712

Timestamp:

05/19/10 22:59:02 (13 years ago)

Author:

Mark Evenson

Message:

Fix bug that prevented SHADOWING-IMPORT from being able to be re-invoked with the same symbols.

[Alan Ruttenberg reported][1] this error.

[1]: ​http://article.gmane.org/gmane.lisp.armedbear.devel/1200

File:

• trunk/abcl/src/org/armedbear/lisp/Package.java (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/Package.java

@@ -593 +593 @@
                         shadowingSymbols.remove(symbolName);
                     unintern(sym);
+                } else if (where == Keyword.INTERNAL) {
+                    // Assert rgument is already correctly a shadowing import
+                    Debug.assertTrue(shadowingSymbols != null);
+                    Debug.assertTrue(shadowingSymbols.get(symbolName) != null);
+                    return;
                 }
             }