Generate valid C# when a secondary base has a public anonymous field

Signed-off-by: Dimitar Dobrev <[email protected]>

Author: ddobrev

src/Generator/Driver.cs

@@ -246,8 +246,8 @@ public void SetupPasses(ILibrary library)
 
             Generator.SetupPasses();
 
-            TranslationUnitPasses.AddPass(new CleanInvalidDeclNamesPass());
             TranslationUnitPasses.AddPass(new FlattenAnonymousTypesToFields());
+            TranslationUnitPasses.AddPass(new CleanInvalidDeclNamesPass());
             TranslationUnitPasses.AddPass(new FieldToPropertyPass());
             TranslationUnitPasses.AddPass(new CheckIgnoredDeclsPass());
             TranslationUnitPasses.AddPass(new CheckFlagEnumsPass());

src/Generator/Passes/FlattenAnonymousTypesToFields.cs

@@ -43,7 +43,23 @@ public override bool VisitClassDecl(Class @class)
                     continue;
 
                 ReplaceField(@class, i, fieldType);
-                ReplaceLayoutField(@class, field, fieldType);
+                fieldType.Fields.Clear();
+                fieldType.ExplicitlyIgnore();
+            }
+
+            if (@class.Layout == null)
+                return true;
+
+            for (int i = @class.Layout.Fields.Count - 1; i >= 0; i--)
+            {
+                LayoutField field = @class.Layout.Fields[i];
+                Class fieldType;
+                if (!string.IsNullOrEmpty(field.Name) ||
+                    !field.QualifiedType.Type.Desugar().TryGetClass(out fieldType) ||
+                    !string.IsNullOrEmpty(fieldType.OriginalName))
+                    continue;
+                
+                ReplaceLayoutField(@class, i, fieldType);
                 fieldType.Fields.Clear();
                 fieldType.ExplicitlyIgnore();
             }
@@ -63,18 +79,23 @@ private static void ReplaceField(Class @class, int i, Class fieldType)
             }
         }
 
-        private static void ReplaceLayoutField(Class @class, Field field, Class fieldType)
+        private static void ReplaceLayoutField(Class @class, int i, Class fieldType)
         {
-            LayoutField layoutField = @class.Layout.Fields.Find(
-                                f => f.FieldPtr == field.OriginalPtr);
-            int layoutIndex = @class.Layout.Fields.IndexOf(layoutField);
-            @class.Layout.Fields.RemoveAt(layoutIndex);
+            uint offset = @class.Layout.Fields[i].Offset;
+            @class.Layout.Fields.RemoveAt(i);
 
             for (int j = 0; j < fieldType.Layout.Fields.Count; j++)
             {
-                LayoutField nestedlayoutField = fieldType.Layout.Fields[j];
-                nestedlayoutField.Offset += layoutField.Offset;
-                @class.Layout.Fields.Insert(layoutIndex + j, nestedlayoutField);
+                LayoutField nestedLayoutField = fieldType.Layout.Fields[j];
+                var layoutField = new LayoutField
+                    {
+                        Expression = nestedLayoutField.Expression,
+                        FieldPtr = nestedLayoutField.FieldPtr,
+                        Name = nestedLayoutField.Name,
+                        Offset = nestedLayoutField.Offset + offset,
+                        QualifiedType = nestedLayoutField.QualifiedType
+                    };
+                @class.Layout.Fields.Insert(i + j, layoutField);
             }
         }
     }

tests/CSharp/CSharp.Tests.cs

@@ -142,7 +142,11 @@ public void TestMultipleInheritance()
             Assert.That(baz.TakesQux(baz), Is.EqualTo(20));
             Assert.That(baz.ReturnQux().FarAwayFunc, Is.EqualTo(20));
             baz.SetMethod(1);
-            Assert.AreEqual(5, baz.P);
+            Assert.That(baz.P, Is.EqualTo(5));
+            baz.PublicDouble = 1.5;
+            Assert.That(baz.PublicDouble, Is.EqualTo(1.5));
+            baz.PublicInt = 15;
+            Assert.That(baz.PublicInt, Is.EqualTo(15));
         }
     }
 

tests/CSharp/CSharp.h

@@ -104,6 +104,11 @@ class DLL_API Bar : public Qux
     Foo foos[4];
     int getIndex();
     void setIndex(int value);
+    union
+    {
+        int publicInt;
+        double publicDouble;
+    };
 
 private:
     int index;