Fix class A::B {}; class A {}

sorear · Oct 27, 2011 · 853ca5d · 853ca5d
1 parent 67f9b80
commit 853ca5d
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/Kernel.cs b/lib/Kernel.cs
@@ -764,13 +764,14 @@ public sealed class RuntimeUnit : IFreeze {
             }
 
             // no conflict if items are simple packages with the same who
-            if (!ose.v.rw && !oseod && oseo.mo.mo.isPackage &&
-                    !nse.v.rw && !nseod && nseo.mo.mo.isPackage &&
+            if (!ose.v.rw && !oseod && !nse.v.rw && !nseod &&
+                    (oseo.mo.mo.isPackage || nseo.mo.mo.isPackage) &&
                     oseo.mo.who.Isa(Kernel.StashMO) &&
                     nseo.mo.who.Isa(Kernel.StashMO) &&
                     Kernel.UnboxAny<string>(oseo.mo.who) ==
                         Kernel.UnboxAny<string>(nseo.mo.who)) {
-                nse = ose;
+                if (nseo.mo.mo.isPackage)
+                    nse = ose;
                 return null;
             }