Add blocks for ctor, dtor, and finalizer bodies. Add constructor that takes a bool from the caller to indicate if the callee should own the pointer passed to it or not

Author: Build Agent

src/Generator/Generators/CLI/CLIHeaders.cs

@@ -376,6 +376,7 @@ public void GenerateClassConstructors(Class @class, string nativeType)
 
             // Output a default constructor that takes the native pointer.
             WriteLine("{0}({1} native);", @class.Name, nativeType);
+            WriteLine("{0}({1} native, bool ownNativeInstance);", @class.Name, nativeType);
             WriteLine("static {0}^ {1}(::System::IntPtr native);",
                 @class.Name, Helpers.CreateInstanceIdentifier);
 

src/Generator/Generators/CLI/CLIMarshal.cs

@@ -275,15 +275,19 @@ public override bool VisitClassDecl(Class @class)
             instance += Context.ReturnVarName;
             var needsCopy = Context.MarshalKind != MarshalKind.NativeField;
 
+            bool ownNativeInstance = false;
+
             if (@class.IsRefType && needsCopy)
             {
                 var name = Generator.GeneratedIdentifier(Context.ReturnVarName);
                 Context.Before.WriteLine("auto {0} = new ::{1}({2});", name,
                     @class.QualifiedOriginalName, Context.ReturnVarName);
                 instance = name;
+
+                ownNativeInstance = true;
             }
 
-            WriteClassInstance(@class, instance);
+            WriteClassInstance(@class, instance, ownNativeInstance);
             return true;
         }
 
@@ -295,15 +299,15 @@ public string QualifiedIdentifier(Declaration decl)
             return decl.QualifiedName;
         }
 
-        public void WriteClassInstance(Class @class, string instance)
+        public void WriteClassInstance(Class @class, string instance, bool ownNativeInstance = false)
         {
             if (@class.IsRefType)
                 Context.Return.Write("({0} == nullptr) ? nullptr : gcnew ",
                     instance);
 
             Context.Return.Write("{0}(", QualifiedIdentifier(@class));
             Context.Return.Write("(::{0}*)", @class.QualifiedOriginalName);
-            Context.Return.Write("{0})", instance);
+            Context.Return.Write("{0}{1})", instance, ownNativeInstance ? ", true" : "");
         }
 
         public override bool VisitFieldDecl(Field field)

src/Generator/Generators/CLI/CLISources.cs

@@ -250,6 +250,8 @@ private void GenerateClassDestructor(Class @class)
             WriteLine("{0}::~{1}()", QualifiedIdentifier(@class), @class.Name);
             WriteOpenBraceAndIndent();
 
+            PushBlock(BlockKind.DestructorBody, @class);
+
             if (CLIGenerator.ShouldGenerateClassNativeField(@class))
             {
                 WriteLine("delete NativePtr;");
@@ -264,6 +266,8 @@ private void GenerateClassDestructor(Class @class)
                 UnindentAndWriteCloseBrace();
             }
 
+            PopBlock();
+
             UnindentAndWriteCloseBrace();
 
             PopBlock(NewLineKind.BeforeNextBlock);
@@ -276,9 +280,13 @@ private void GenerateClassFinalizer(Class @class)
             WriteLine("{0}::!{1}()", QualifiedIdentifier(@class), @class.Name);
             WriteOpenBraceAndIndent();
 
+            PushBlock(BlockKind.FinalizerBody, @class);
+
             if (CLIGenerator.ShouldGenerateClassNativeField(@class))
                 WriteLine("delete NativePtr;");
 
+            PopBlock();
+
             UnindentAndWriteCloseBrace();
 
             PopBlock(NewLineKind.BeforeNextBlock);
@@ -618,28 +626,30 @@ private void GenerateVariable(Variable variable, Class @class)
                 GeneratePropertySetter(variable, @class, variable.Name, variable.Type);
         }
 
-        private void GenerateClassConstructor(Class @class)
+        private void GenerateClassConstructor(Class @class, bool withOwnNativeInstanceParam = false)
         {
             string qualifiedIdentifier = QualifiedIdentifier(@class);
 
             Write("{0}::{1}(", qualifiedIdentifier, @class.Name);
 
             var nativeType = string.Format("::{0}*", @class.QualifiedOriginalName);
-            WriteLine("{0} native)", nativeType);
+            WriteLine(!withOwnNativeInstanceParam ? "{0} native)" : "{0} native, const bool ownNativeInstance)", nativeType);
 
-            var hasBase = GenerateClassConstructorBase(@class);
+            var hasBase = GenerateClassConstructorBase(@class, null, withOwnNativeInstanceParam);
 
             if (CLIGenerator.ShouldGenerateClassNativeField(@class))
             {
                 Indent();
                 Write(hasBase ? "," : ":");
                 Unindent();
 
-                WriteLine(" {0}(false)", Helpers.OwnsNativeInstanceIdentifier);
+                WriteLine(!withOwnNativeInstanceParam ? " {0}(false)" : " {0}(ownNativeInstance)", Helpers.OwnsNativeInstanceIdentifier);
             }
 
             WriteOpenBraceAndIndent();
 
+            PushBlock(BlockKind.ConstructorBody, @class);
+
             const string nativePtr = "native";
 
             if (@class.IsRefType)
@@ -654,16 +664,24 @@ private void GenerateClassConstructor(Class @class)
                 GenerateStructMarshaling(@class, nativePtr + "->");
             }
 
+            PopBlock();
+
             UnindentAndWriteCloseBrace();
-            NewLine();
-            WriteLine("{0}^ {0}::{1}(::System::IntPtr native)", qualifiedIdentifier, Helpers.CreateInstanceIdentifier);
 
-            WriteOpenBraceAndIndent();
+            if (!withOwnNativeInstanceParam)
+            {
+                NewLine();
+                WriteLine("{0}^ {0}::{1}(::System::IntPtr native)", qualifiedIdentifier, Helpers.CreateInstanceIdentifier);
 
-            WriteLine("return gcnew ::{0}(({1}) native.ToPointer());", qualifiedIdentifier, nativeType);
+                WriteOpenBraceAndIndent();
 
-            UnindentAndWriteCloseBrace();
-            NewLine();
+                WriteLine("return gcnew ::{0}(({1}) native.ToPointer());", qualifiedIdentifier, nativeType);
+
+                UnindentAndWriteCloseBrace();
+                NewLine();
+
+                GenerateClassConstructor(@class, true);
+            }
         }
 
         private void GenerateStructMarshaling(Class @class, string nativeVar)
@@ -701,7 +719,7 @@ private void GenerateStructMarshaling(Class @class, string nativeVar)
             }
         }
 
-        private bool GenerateClassConstructorBase(Class @class, Method method = null)
+        private bool GenerateClassConstructorBase(Class @class, Method method = null, bool withOwnNativeInstanceParam = false)
         {
             var hasBase = @class.HasBase && @class.Bases[0].IsClass && @class.Bases[0].Class.IsGenerated;
             if (!hasBase)
@@ -720,7 +738,7 @@ private bool GenerateClassConstructorBase(Class @class, Method method = null)
                 var nativeTypeName = baseClass.Visit(cppTypePrinter);
                 Write("({0}*)", nativeTypeName);
 
-                WriteLine("{0})", method != null ? "nullptr" : "native");
+                WriteLine("{0}{1})", method != null ? "nullptr" : "native", !withOwnNativeInstanceParam ? "" : ", ownNativeInstance");
 
                 Unindent();
             }
@@ -754,7 +772,11 @@ public void GenerateMethod(Method method, Class @class)
             PushBlock(BlockKind.MethodBody, method);
 
             if (method.IsConstructor && @class.IsRefType)
+            {
+                PushBlock(BlockKind.ConstructorBody, @class);
+
                 WriteLine("{0} = true;", Helpers.OwnsNativeInstanceIdentifier);
+            }
 
             if (method.IsProxy)
                 goto SkipImpl;
@@ -770,6 +792,8 @@ public void GenerateMethod(Method method, Class @class)
                         GenerateFunctionParams(@params);
                         WriteLine(");");
                     }
+
+                    PopBlock();
                 }
                 else
                 {

src/Generator/Utils/BlockGenerator.cs

@@ -50,6 +50,9 @@ public enum BlockKind
         Destructor,
         AccessSpecifier,
         Fields,
+        ConstructorBody,
+        DestructorBody,
+        FinalizerBody
     }
 
     [DebuggerDisplay("{Kind} | {Object}")]