Fix inheritance of an outer class by an inner class

sorear · Oct 29, 2011 · 616e8ac · 616e8ac
1 parent 000cc77
commit 616e8ac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/CodeGen.cs b/lib/CodeGen.cs
@@ -4074,7 +4074,6 @@ object Call(object[] args) {
                 string err = st.mo.Compose();
                 if (err != null)
                     return new Exception(err);
-                st.Invalidate();
                 return null;
             } else if (cmd == "type_kind") {
                 STable st = (STable)Handle.Unbox(args[1]);

diff --git a/lib/ObjModel.cs b/lib/ObjModel.cs
@@ -591,6 +591,8 @@ public string Compose() {
             if (rtype == "role" || rtype == "prole") {
                 isRole = true;
                 SetMRO(Kernel.AnyMO.mo.mro);
+                Revalidate();
+                stable.SetupVTables();
                 return null;
             }
 
@@ -622,6 +624,8 @@ public string Compose() {
             foreach (string an in stable.all_slot) {
                 stable.slotMap[an] = stable.nslots++;
             }
+            Revalidate();
+            stable.SetupVTables();
             return null;
         }