Changeset 14559

Timestamp:

06/23/13 14:20:40 (10 years ago)

Author:

Mark Evenson

Message:

Backport r14557 | ehuelsmann | 2013-06-22 21:32:46 +0200 (Sat, 22 Jun 2013) | 1 line.

More refactoring of shadowingImport: unbreak METATILITIES.

File:

• branches/1.2.x/src/org/armedbear/lisp/Package.java (modified) (1 diff)

branches/1.2.x/src/org/armedbear/lisp/Package.java

@@ -607 +607 @@
         if (sym == null)
             sym = internalSymbols.get(symbol.name.toString());
-        if (sym != null) {
-            if (sym != symbol) {
-                if (shadowingSymbols != null)
-                    shadowingSymbols.remove(symbolName);
-                unintern(sym);
-            } else {
-                // Assert argument is already correctly a shadowing import
-                Debug.assertTrue(shadowingSymbols != null);
-                Debug.assertTrue(shadowingSymbols.get(symbolName) != null);
-                return;
-            }
-        }
-        internalSymbols.put(symbol.name.toString(), symbol);
+
+        // if a different symbol with the same name is accessible,
+        // [..] which implies that it must be uninterned if it was present
+        if (sym != null && sym != symbol) {
+            if (shadowingSymbols != null)
+                shadowingSymbols.remove(symbolName);
+            unintern(sym);
+        }
+
+        if (sym == null || sym != symbol) {
+            // there was no symbol, or we just unintered it another one
+            // intern the new one
+            internalSymbols.put(symbol.name.toString(), symbol);
+        }
+
         if (shadowingSymbols == null)
             shadowingSymbols = new HashMap<String,Symbol>();
-        Debug.assertTrue(shadowingSymbols.get(symbolName) == null);
         shadowingSymbols.put(symbolName, symbol);
     }