[armedbear-cvs] r12712 - trunk/abcl/src/org/armedbear/lisp

[Mark Evenson]

Author: mevenson
Date: Wed May 19 18:59:02 2010
New Revision: 12712

Log:
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



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

Modified: trunk/abcl/src/org/armedbear/lisp/Package.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Package.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Package.java	Wed May 19 18:59:02 2010
@@ -592,6 +592,11 @@
                     if (shadowingSymbols != null)
                         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;
                 }
             }
         }