Changeset 12977

Timestamp:

10/17/10 15:22:41 (12 years ago)

Author:

ehuelsmann

Message:

Unintern symbols with a deleted package as their
home package. This is what SBCL does too and fixes
current ANSI tests breakage.

File:

• trunk/abcl/src/org/armedbear/lisp/Package.java (modified) (2 diffs)

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

@@ -50 +50 @@
     private transient LispObject propertyList;
 
+    /** Symbols internal to the package. */
     private transient final ConcurrentHashMap<String, Symbol> internalSymbols
             = new ConcurrentHashMap<String, Symbol>(16);
+    /** Symbols exported from the package.
+     *
+     * Those symbols in this collection are not contained in the internalSymbols
+     */
     private transient final ConcurrentHashMap<String, Symbol> externalSymbols
             = new ConcurrentHashMap<String, Symbol>(16);
@@ -142 +147 @@
     }
 
+    private void makeSymbolsUninterned(ConcurrentHashMap symbolMap) {
+        Symbol sym;
+        for (Iterator<Symbol> it = symbolMap.values().iterator();
+                it.hasNext();) {
+            sym = it.next();
+            if (sym.getPackage() == this) {
+                sym.setPackage(NIL);
+            }
+        }
+        symbolMap.clear();
+    }
+
     public final synchronized boolean delete()
     {
         if (name != null) {
             Packages.deletePackage(this);
-            internalSymbols.clear();
-            externalSymbols.clear();
+
+            makeSymbolsUninterned(internalSymbols);
+            makeSymbolsUninterned(externalSymbols); // also clears externalSymbols
 
             name = null;