Merge pull request #353 An error occurred from ddobrev/master

Restored ParserOptions as a ref type because it is inherited

src/CppParser/Bindings/CLI/CppParser.cpp

@@ -291,166 +291,211 @@ void CppSharp::Parser::ParserOptions::LanguageVersion::set(CppSharp::Parser::Lan
 
 CppSharp::Parser::ParserDiagnostic::ParserDiagnostic(::CppSharp::CppParser::ParserDiagnostic* native)
 {
-    NativePtr = native;
+    __Level = (CppSharp::Parser::ParserDiagnosticLevel)native->Level;
+    __LineNumber = native->LineNumber;
+    __ColumnNumber = native->ColumnNumber;
 }
 
 CppSharp::Parser::ParserDiagnostic::ParserDiagnostic(System::IntPtr native)
 {
     auto __native = (::CppSharp::CppParser::ParserDiagnostic*)native.ToPointer();
-    NativePtr = __native;
-}
-
-CppSharp::Parser::ParserDiagnostic::ParserDiagnostic()
-{
-    NativePtr = new ::CppSharp::CppParser::ParserDiagnostic();
-}
-
-System::IntPtr CppSharp::Parser::ParserDiagnostic::__Instance::get()
-{
-    return System::IntPtr(NativePtr);
-}
-
-void CppSharp::Parser::ParserDiagnostic::__Instance::set(System::IntPtr object)
-{
-    NativePtr = (::CppSharp::CppParser::ParserDiagnostic*)object.ToPointer();
+    __Level = (CppSharp::Parser::ParserDiagnosticLevel)__native->Level;
+    __LineNumber = __native->LineNumber;
+    __ColumnNumber = __native->ColumnNumber;
 }
 
 System::String^ CppSharp::Parser::ParserDiagnostic::FileName::get()
 {
-    auto __ret = ((::CppSharp::CppParser::ParserDiagnostic*)NativePtr)->getFileName();
+    auto _this0 = ::CppSharp::CppParser::ParserDiagnostic();
+    _this0.Level = (::CppSharp::CppParser::ParserDiagnosticLevel)(*this).Level;
+    _this0.LineNumber = (*this).LineNumber;
+    _this0.ColumnNumber = (*this).ColumnNumber;
+    auto __ret = _this0.getFileName();
+    __Level = (CppSharp::Parser::ParserDiagnosticLevel)_this0.Level;
+    __LineNumber = _this0.LineNumber;
+    __ColumnNumber = _this0.ColumnNumber;
     if (__ret == nullptr) return nullptr;
     return clix::marshalString<clix::E_UTF8>(__ret);
 }
 
 void CppSharp::Parser::ParserDiagnostic::FileName::set(System::String^ s)
 {
+    auto _this0 = ::CppSharp::CppParser::ParserDiagnostic();
+    _this0.Level = (::CppSharp::CppParser::ParserDiagnosticLevel)(*this).Level;
+    _this0.LineNumber = (*this).LineNumber;
+    _this0.ColumnNumber = (*this).ColumnNumber;
     auto _arg0 = clix::marshalString<clix::E_UTF8>(s);
     auto arg0 = _arg0.c_str();
-    ((::CppSharp::CppParser::ParserDiagnostic*)NativePtr)->setFileName(arg0);
+    _this0.setFileName(arg0);
+    __Level = (CppSharp::Parser::ParserDiagnosticLevel)_this0.Level;
+    __LineNumber = _this0.LineNumber;
+    __ColumnNumber = _this0.ColumnNumber;
 }
 
 System::String^ CppSharp::Parser::ParserDiagnostic::Message::get()
 {
-    auto __ret = ((::CppSharp::CppParser::ParserDiagnostic*)NativePtr)->getMessage();
+    auto _this0 = ::CppSharp::CppParser::ParserDiagnostic();
+    _this0.Level = (::CppSharp::CppParser::ParserDiagnosticLevel)(*this).Level;
+    _this0.LineNumber = (*this).LineNumber;
+    _this0.ColumnNumber = (*this).ColumnNumber;
+    auto __ret = _this0.getMessage();
+    __Level = (CppSharp::Parser::ParserDiagnosticLevel)_this0.Level;
+    __LineNumber = _this0.LineNumber;
+    __ColumnNumber = _this0.ColumnNumber;
     if (__ret == nullptr) return nullptr;
     return clix::marshalString<clix::E_UTF8>(__ret);
 }
 
 void CppSharp::Parser::ParserDiagnostic::Message::set(System::String^ s)
 {
+    auto _this0 = ::CppSharp::CppParser::ParserDiagnostic();
+    _this0.Level = (::CppSharp::CppParser::ParserDiagnosticLevel)(*this).Level;
+    _this0.LineNumber = (*this).LineNumber;
+    _this0.ColumnNumber = (*this).ColumnNumber;
     auto _arg0 = clix::marshalString<clix::E_UTF8>(s);
     auto arg0 = _arg0.c_str();
-    ((::CppSharp::CppParser::ParserDiagnostic*)NativePtr)->setMessage(arg0);
+    _this0.setMessage(arg0);
+    __Level = (CppSharp::Parser::ParserDiagnosticLevel)_this0.Level;
+    __LineNumber = _this0.LineNumber;
+    __ColumnNumber = _this0.ColumnNumber;
 }
 
 CppSharp::Parser::ParserDiagnosticLevel CppSharp::Parser::ParserDiagnostic::Level::get()
 {
-    return (CppSharp::Parser::ParserDiagnosticLevel)((::CppSharp::CppParser::ParserDiagnostic*)NativePtr)->Level;
+    return __Level;
 }
 
 void CppSharp::Parser::ParserDiagnostic::Level::set(CppSharp::Parser::ParserDiagnosticLevel value)
 {
-    ((::CppSharp::CppParser::ParserDiagnostic*)NativePtr)->Level = (::CppSharp::CppParser::ParserDiagnosticLevel)value;
+    __Level = value;
 }
 
 int CppSharp::Parser::ParserDiagnostic::LineNumber::get()
 {
-    return ((::CppSharp::CppParser::ParserDiagnostic*)NativePtr)->LineNumber;
+    return __LineNumber;
 }
 
 void CppSharp::Parser::ParserDiagnostic::LineNumber::set(int value)
 {
-    ((::CppSharp::CppParser::ParserDiagnostic*)NativePtr)->LineNumber = value;
+    __LineNumber = value;
 }
 
 int CppSharp::Parser::ParserDiagnostic::ColumnNumber::get()
 {
-    return ((::CppSharp::CppParser::ParserDiagnostic*)NativePtr)->ColumnNumber;
+    return __ColumnNumber;
 }
 
 void CppSharp::Parser::ParserDiagnostic::ColumnNumber::set(int value)
 {
-    ((::CppSharp::CppParser::ParserDiagnostic*)NativePtr)->ColumnNumber = value;
+    __ColumnNumber = value;
 }
 
 CppSharp::Parser::ParserResult::ParserResult(::CppSharp::CppParser::ParserResult* native)
 {
-    NativePtr = native;
+    __Kind = (CppSharp::Parser::ParserResultKind)native->Kind;
+    __ASTContext = (native->ASTContext == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::ASTContext((::CppSharp::CppParser::AST::ASTContext*)native->ASTContext);
+    __Library = (native->Library == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::NativeLibrary((::CppSharp::CppParser::AST::NativeLibrary*)native->Library);
 }
 
 CppSharp::Parser::ParserResult::ParserResult(System::IntPtr native)
 {
     auto __native = (::CppSharp::CppParser::ParserResult*)native.ToPointer();
-    NativePtr = __native;
-}
-
-CppSharp::Parser::ParserResult::ParserResult()
-{
-    NativePtr = new ::CppSharp::CppParser::ParserResult();
-}
-
-CppSharp::Parser::ParserDiagnostic^ CppSharp::Parser::ParserResult::getDiagnostics(unsigned int i)
-{
-    auto __ret = ((::CppSharp::CppParser::ParserResult*)NativePtr)->getDiagnostics(i);
-    auto ____ret = new ::CppSharp::CppParser::ParserDiagnostic(__ret);
-    return (____ret == nullptr) ? nullptr : gcnew CppSharp::Parser::ParserDiagnostic((::CppSharp::CppParser::ParserDiagnostic*)____ret);
-}
-
-void CppSharp::Parser::ParserResult::addDiagnostics(CppSharp::Parser::ParserDiagnostic^ s)
-{
-    auto &arg0 = *(::CppSharp::CppParser::ParserDiagnostic*)s->NativePtr;
-    ((::CppSharp::CppParser::ParserResult*)NativePtr)->addDiagnostics(arg0);
+    __Kind = (CppSharp::Parser::ParserResultKind)__native->Kind;
+    __ASTContext = (__native->ASTContext == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::ASTContext((::CppSharp::CppParser::AST::ASTContext*)__native->ASTContext);
+    __Library = (__native->Library == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::NativeLibrary((::CppSharp::CppParser::AST::NativeLibrary*)__native->Library);
+}
+
+CppSharp::Parser::ParserDiagnostic CppSharp::Parser::ParserResult::getDiagnostics(unsigned int i)
+{
+    auto _this0 = ::CppSharp::CppParser::ParserResult();
+    _this0.Kind = (::CppSharp::CppParser::ParserResultKind)(*this).Kind;
+    if ((*this).ASTContext != nullptr)
+        _this0.ASTContext = (::CppSharp::CppParser::AST::ASTContext*)(*this).ASTContext->NativePtr;
+    if ((*this).Library != nullptr)
+        _this0.Library = (::CppSharp::CppParser::AST::NativeLibrary*)(*this).Library->NativePtr;
+    auto __ret = _this0.getDiagnostics(i);
+    __Kind = (CppSharp::Parser::ParserResultKind)_this0.Kind;
+    __ASTContext = (_this0.ASTContext == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::ASTContext((::CppSharp::CppParser::AST::ASTContext*)_this0.ASTContext);
+    __Library = (_this0.Library == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::NativeLibrary((::CppSharp::CppParser::AST::NativeLibrary*)_this0.Library);
+    return CppSharp::Parser::ParserDiagnostic((::CppSharp::CppParser::ParserDiagnostic*)&__ret);
+}
+
+void CppSharp::Parser::ParserResult::addDiagnostics(CppSharp::Parser::ParserDiagnostic s)
+{
+    auto _this0 = ::CppSharp::CppParser::ParserResult();
+    _this0.Kind = (::CppSharp::CppParser::ParserResultKind)(*this).Kind;
+    if ((*this).ASTContext != nullptr)
+        _this0.ASTContext = (::CppSharp::CppParser::AST::ASTContext*)(*this).ASTContext->NativePtr;
+    if ((*this).Library != nullptr)
+        _this0.Library = (::CppSharp::CppParser::AST::NativeLibrary*)(*this).Library->NativePtr;
+    auto _marshal0 = ::CppSharp::CppParser::ParserDiagnostic();
+    _marshal0.Level = (::CppSharp::CppParser::ParserDiagnosticLevel)s.Level;
+    _marshal0.LineNumber = s.LineNumber;
+    _marshal0.ColumnNumber = s.ColumnNumber;
+    auto arg0 = _marshal0;
+    _this0.addDiagnostics(arg0);
+    __Kind = (CppSharp::Parser::ParserResultKind)_this0.Kind;
+    __ASTContext = (_this0.ASTContext == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::ASTContext((::CppSharp::CppParser::AST::ASTContext*)_this0.ASTContext);
+    __Library = (_this0.Library == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::NativeLibrary((::CppSharp::CppParser::AST::NativeLibrary*)_this0.Library);
 }
 
 void CppSharp::Parser::ParserResult::clearDiagnostics()
 {
-    ((::CppSharp::CppParser::ParserResult*)NativePtr)->clearDiagnostics();
-}
-
-System::IntPtr CppSharp::Parser::ParserResult::__Instance::get()
-{
-    return System::IntPtr(NativePtr);
-}
-
-void CppSharp::Parser::ParserResult::__Instance::set(System::IntPtr object)
-{
-    NativePtr = (::CppSharp::CppParser::ParserResult*)object.ToPointer();
+    auto _this0 = ::CppSharp::CppParser::ParserResult();
+    _this0.Kind = (::CppSharp::CppParser::ParserResultKind)(*this).Kind;
+    if ((*this).ASTContext != nullptr)
+        _this0.ASTContext = (::CppSharp::CppParser::AST::ASTContext*)(*this).ASTContext->NativePtr;
+    if ((*this).Library != nullptr)
+        _this0.Library = (::CppSharp::CppParser::AST::NativeLibrary*)(*this).Library->NativePtr;
+    _this0.clearDiagnostics();
+    __Kind = (CppSharp::Parser::ParserResultKind)_this0.Kind;
+    __ASTContext = (_this0.ASTContext == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::ASTContext((::CppSharp::CppParser::AST::ASTContext*)_this0.ASTContext);
+    __Library = (_this0.Library == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::NativeLibrary((::CppSharp::CppParser::AST::NativeLibrary*)_this0.Library);
 }
 
 unsigned int CppSharp::Parser::ParserResult::DiagnosticsCount::get()
 {
-    auto __ret = ((::CppSharp::CppParser::ParserResult*)NativePtr)->getDiagnosticsCount();
+    auto _this0 = ::CppSharp::CppParser::ParserResult();
+    _this0.Kind = (::CppSharp::CppParser::ParserResultKind)(*this).Kind;
+    if ((*this).ASTContext != nullptr)
+        _this0.ASTContext = (::CppSharp::CppParser::AST::ASTContext*)(*this).ASTContext->NativePtr;
+    if ((*this).Library != nullptr)
+        _this0.Library = (::CppSharp::CppParser::AST::NativeLibrary*)(*this).Library->NativePtr;
+    auto __ret = _this0.getDiagnosticsCount();
+    __Kind = (CppSharp::Parser::ParserResultKind)_this0.Kind;
+    __ASTContext = (_this0.ASTContext == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::ASTContext((::CppSharp::CppParser::AST::ASTContext*)_this0.ASTContext);
+    __Library = (_this0.Library == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::NativeLibrary((::CppSharp::CppParser::AST::NativeLibrary*)_this0.Library);
     return __ret;
 }
 
 CppSharp::Parser::ParserResultKind CppSharp::Parser::ParserResult::Kind::get()
 {
-    return (CppSharp::Parser::ParserResultKind)((::CppSharp::CppParser::ParserResult*)NativePtr)->Kind;
+    return __Kind;
 }
 
 void CppSharp::Parser::ParserResult::Kind::set(CppSharp::Parser::ParserResultKind value)
 {
-    ((::CppSharp::CppParser::ParserResult*)NativePtr)->Kind = (::CppSharp::CppParser::ParserResultKind)value;
+    __Kind = value;
 }
 
 CppSharp::Parser::AST::ASTContext^ CppSharp::Parser::ParserResult::ASTContext::get()
 {
-    return (((::CppSharp::CppParser::ParserResult*)NativePtr)->ASTContext == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::ASTContext((::CppSharp::CppParser::AST::ASTContext*)((::CppSharp::CppParser::ParserResult*)NativePtr)->ASTContext);
+    return __ASTContext;
 }
 
 void CppSharp::Parser::ParserResult::ASTContext::set(CppSharp::Parser::AST::ASTContext^ value)
 {
-    ((::CppSharp::CppParser::ParserResult*)NativePtr)->ASTContext = (::CppSharp::CppParser::AST::ASTContext*)value->NativePtr;
+    __ASTContext = value;
 }
 
 CppSharp::Parser::AST::NativeLibrary^ CppSharp::Parser::ParserResult::Library::get()
 {
-    return (((::CppSharp::CppParser::ParserResult*)NativePtr)->Library == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::NativeLibrary((::CppSharp::CppParser::AST::NativeLibrary*)((::CppSharp::CppParser::ParserResult*)NativePtr)->Library);
+    return __Library;
 }
 
 void CppSharp::Parser::ParserResult::Library::set(CppSharp::Parser::AST::NativeLibrary^ value)
 {
-    ((::CppSharp::CppParser::ParserResult*)NativePtr)->Library = (::CppSharp::CppParser::AST::NativeLibrary*)value->NativePtr;
+    __Library = value;
 }
 
 CppSharp::Parser::ClangParser::ClangParser(::CppSharp::CppParser::ClangParser* native)
@@ -464,20 +509,18 @@ CppSharp::Parser::ClangParser::ClangParser(System::IntPtr native)
     NativePtr = __native;
 }
 
-CppSharp::Parser::ParserResult^ CppSharp::Parser::ClangParser::ParseHeader(CppSharp::Parser::ParserOptions^ Opts)
+CppSharp::Parser::ParserResult CppSharp::Parser::ClangParser::ParseHeader(CppSharp::Parser::ParserOptions^ Opts)
 {
     auto arg0 = (::CppSharp::CppParser::ParserOptions*)Opts->NativePtr;
     auto __ret = ::CppSharp::CppParser::ClangParser::ParseHeader(arg0);
-    if (__ret == nullptr) return nullptr;
-    return (__ret == nullptr) ? nullptr : gcnew CppSharp::Parser::ParserResult((::CppSharp::CppParser::ParserResult*)__ret);
+    return CppSharp::Parser::ParserResult((::CppSharp::CppParser::ParserResult*)__ret);
 }
 
-CppSharp::Parser::ParserResult^ CppSharp::Parser::ClangParser::ParseLibrary(CppSharp::Parser::ParserOptions^ Opts)
+CppSharp::Parser::ParserResult CppSharp::Parser::ClangParser::ParseLibrary(CppSharp::Parser::ParserOptions^ Opts)
 {
     auto arg0 = (::CppSharp::CppParser::ParserOptions*)Opts->NativePtr;
     auto __ret = ::CppSharp::CppParser::ClangParser::ParseLibrary(arg0);
-    if (__ret == nullptr) return nullptr;
-    return (__ret == nullptr) ? nullptr : gcnew CppSharp::Parser::ParserResult((::CppSharp::CppParser::ParserResult*)__ret);
+    return CppSharp::Parser::ParserResult((::CppSharp::CppParser::ParserResult*)__ret);
 }
 
 CppSharp::Parser::ParserTargetInfo^ CppSharp::Parser::ClangParser::GetTargetInfo(CppSharp::Parser::ParserOptions^ Opts)

src/CppParser/Bindings/CLI/CppParser.h

@@ -13,10 +13,10 @@ namespace CppSharp
         enum struct SourceLocationKind;
         ref class ClangParser;
         ref class Parser;
-        ref class ParserDiagnostic;
         ref class ParserOptions;
-        ref class ParserResult;
         ref class ParserTargetInfo;
+        value struct ParserDiagnostic;
+        value struct ParserResult;
         namespace AST
         {
             enum struct CppAbi;
@@ -207,21 +207,12 @@ namespace CppSharp
             void clearLibraryDirs();
         };
 
-        public ref class ParserDiagnostic : ICppInstance
+        public value struct ParserDiagnostic
         {
         public:
 
-            property ::CppSharp::CppParser::ParserDiagnostic* NativePtr;
-            property System::IntPtr __Instance
-            {
-                virtual System::IntPtr get();
-                virtual void set(System::IntPtr instance);
-            }
-
             ParserDiagnostic(::CppSharp::CppParser::ParserDiagnostic* native);
             ParserDiagnostic(System::IntPtr native);
-            ParserDiagnostic();
-
             property System::String^ FileName
             {
                 System::String^ get();
@@ -251,23 +242,19 @@ namespace CppSharp
                 int get();
                 void set(int);
             }
+
+            private:
+            CppSharp::Parser::ParserDiagnosticLevel __Level;
+            int __LineNumber;
+            int __ColumnNumber;
         };
 
-        public ref class ParserResult : ICppInstance
+        public value struct ParserResult
         {
         public:
 
-            property ::CppSharp::CppParser::ParserResult* NativePtr;
-            property System::IntPtr __Instance
-            {
-                virtual System::IntPtr get();
-                virtual void set(System::IntPtr instance);
-            }
-
             ParserResult(::CppSharp::CppParser::ParserResult* native);
             ParserResult(System::IntPtr native);
-            ParserResult();
-
             property unsigned int DiagnosticsCount
             {
                 unsigned int get();
@@ -291,11 +278,17 @@ namespace CppSharp
                 void set(CppSharp::Parser::AST::NativeLibrary^);
             }
 
-            CppSharp::Parser::ParserDiagnostic^ getDiagnostics(unsigned int i);
+            CppSharp::Parser::ParserDiagnostic getDiagnostics(unsigned int i);
 
-            void addDiagnostics(CppSharp::Parser::ParserDiagnostic^ s);
+            void addDiagnostics(CppSharp::Parser::ParserDiagnostic s);
 
             void clearDiagnostics();
+
+            private:
+            CppSharp::Parser::ParserResultKind __Kind;
+            CppSharp::Parser::AST::ASTContext^ __ASTContext;
+            CppSharp::Parser::AST::NativeLibrary^ __Library;
+            CppSharp::Parser::Parser^ __CodeParser;
         };
 
         public ref class ClangParser : ICppInstance
@@ -313,9 +306,9 @@ namespace CppSharp
             ClangParser(System::IntPtr native);
             ClangParser();
 
-            static CppSharp::Parser::ParserResult^ ParseHeader(CppSharp::Parser::ParserOptions^ Opts);
+            static CppSharp::Parser::ParserResult ParseHeader(CppSharp::Parser::ParserOptions^ Opts);
 
-            static CppSharp::Parser::ParserResult^ ParseLibrary(CppSharp::Parser::ParserOptions^ Opts);
+            static CppSharp::Parser::ParserResult ParseLibrary(CppSharp::Parser::ParserOptions^ Opts);
 
             static CppSharp::Parser::ParserTargetInfo^ GetTargetInfo(CppSharp::Parser::ParserOptions^ Opts);
         };

src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppParser.cs

@@ -232,31 +232,35 @@ namespace CppSharp
 
             public global::System.IntPtr __Instance { get; protected set; }
 
-            internal ParserOptions(ParserOptions.Internal* native)
-                : this(new global::System.IntPtr(native))
+            private readonly bool __ownsNativeInstance;
+
+            public static new ParserOptions __CreateInstance(global::System.IntPtr native)
             {
+                return new ParserOptions((ParserOptions.Internal*) native);
             }
 
-            private static global::System.IntPtr __CopyValue(ParserOptions.Internal native)
+            private static ParserOptions.Internal* __CopyValue(ParserOptions.Internal native)
             {
                 var ret = Marshal.AllocHGlobal(116);
                 CppSharp.Parser.ParserOptions.Internal.cctor_2(ret, new global::System.IntPtr(&native));
-                return ret;
+                return (ParserOptions.Internal*) ret;
             }
 
             internal ParserOptions(ParserOptions.Internal native)
                 : this(__CopyValue(native))
             {
+                __ownsNativeInstance = true;
             }
 
-            public ParserOptions(global::System.IntPtr native, bool isInternalImpl = false)
+            protected ParserOptions(ParserOptions.Internal* native, bool isInternalImpl = false)
             {
-                __Instance = native;
+                __Instance = new global::System.IntPtr(native);
             }
 
             public ParserOptions()
             {
                 __Instance = Marshal.AllocHGlobal(116);
+                __ownsNativeInstance = true;
                 Internal.ctor_0(__Instance);
             }
 
@@ -269,7 +273,10 @@ namespace CppSharp
             protected virtual void Dispose(bool disposing)
             {
                 Internal.dtor_0(__Instance);
-                Marshal.FreeHGlobal(__Instance);
+                if (__ownsNativeInstance)
+                {
+                    Marshal.FreeHGlobal(__Instance);
+                }
             }
 
             public string getArguments(uint i)
@@ -479,7 +486,7 @@ namespace CppSharp
                 get
                 {
                     var __ptr = (Internal*)__Instance.ToPointer();
-                    return (__ptr->ASTContext == IntPtr.Zero) ? null : new CppSharp.Parser.AST.ASTContext(__ptr->ASTContext);
+                    return (__ptr->ASTContext == IntPtr.Zero) ? null : CppSharp.Parser.AST.ASTContext.__CreateInstance(__ptr->ASTContext);
                 }
 
                 set
@@ -595,7 +602,7 @@ namespace CppSharp
             }
         }
 
-        public unsafe partial class ParserDiagnostic : IDisposable
+        public unsafe partial struct ParserDiagnostic
         {
             [StructLayout(LayoutKind.Explicit, Size = 36)]
             public partial struct Internal
@@ -645,53 +652,49 @@ namespace CppSharp
                 internal static extern void setMessage_0(global::System.IntPtr instance, global::System.IntPtr s);
             }
 
-            public global::System.IntPtr __Instance { get; protected set; }
-
-            internal ParserDiagnostic(ParserDiagnostic.Internal* native)
-                : this(new global::System.IntPtr(native))
-            {
-            }
-
-            private static global::System.IntPtr __CopyValue(ParserDiagnostic.Internal native)
+            public static new ParserDiagnostic __CreateInstance(global::System.IntPtr native)
             {
-                var ret = Marshal.AllocHGlobal(36);
-                CppSharp.Parser.ParserDiagnostic.Internal.cctor_1(ret, new global::System.IntPtr(&native));
-                return ret;
+                return new ParserDiagnostic((ParserDiagnostic.Internal*) native);
             }
 
             internal ParserDiagnostic(ParserDiagnostic.Internal native)
-                : this(__CopyValue(native))
-            {
-            }
-
-            public ParserDiagnostic(global::System.IntPtr native, bool isInternalImpl = false)
+                : this(&native)
             {
-                __Instance = native;
             }
 
-            public ParserDiagnostic()
+            private ParserDiagnostic(ParserDiagnostic.Internal* native, bool isInternalImpl = false) : this()
             {
-                __Instance = Marshal.AllocHGlobal(36);
-                Internal.ctor_0(__Instance);
+                var __ptr = native;
+                Level = __ptr->Level;
+                LineNumber = __ptr->LineNumber;
+                ColumnNumber = __ptr->ColumnNumber;
             }
 
-            public void Dispose()
+            internal Internal ToInternal()
             {
-                Dispose(disposing: true);
-                GC.SuppressFinalize(this);
+                var __native = new CppSharp.Parser.ParserDiagnostic.Internal();
+                var __ptr = &__native;
+                __native.Level = Level;
+                __native.LineNumber = LineNumber;
+                __native.ColumnNumber = ColumnNumber;
+                return __native;
             }
 
-            protected virtual void Dispose(bool disposing)
+            internal void FromInternal(Internal* native)
             {
-                Internal.dtor_0(__Instance);
-                Marshal.FreeHGlobal(__Instance);
+                var __ptr = native;
+                Level = __ptr->Level;
+                LineNumber = __ptr->LineNumber;
+                ColumnNumber = __ptr->ColumnNumber;
             }
 
             public string FileName
             {
                 get
                 {
-                    var __ret = Internal.getFileName_0(__Instance);
+                    var __fixedInstance = ToInternal();
+                    var __ret = Internal.getFileName_0(new global::System.IntPtr(&__fixedInstance));
+                    FromInternal(&__fixedInstance);
                     if (__ret == global::System.IntPtr.Zero) return null;
                     return Marshal.PtrToStringAnsi(__ret);
                 }
@@ -699,8 +702,10 @@ namespace CppSharp
                 set
                 {
                     var arg0 = Marshal.StringToHGlobalAnsi(value);
-                    Internal.setFileName_0(__Instance, arg0);
+                    var __fixedInstance = ToInternal();
+                    Internal.setFileName_0(new global::System.IntPtr(&__fixedInstance), arg0);
                     Marshal.FreeHGlobal(arg0);
+                    FromInternal(&__fixedInstance);
                 }
             }
 
@@ -708,7 +713,9 @@ namespace CppSharp
             {
                 get
                 {
-                    var __ret = Internal.getMessage_0(__Instance);
+                    var __fixedInstance = ToInternal();
+                    var __ret = Internal.getMessage_0(new global::System.IntPtr(&__fixedInstance));
+                    FromInternal(&__fixedInstance);
                     if (__ret == global::System.IntPtr.Zero) return null;
                     return Marshal.PtrToStringAnsi(__ret);
                 }
@@ -716,58 +723,36 @@ namespace CppSharp
                 set
                 {
                     var arg0 = Marshal.StringToHGlobalAnsi(value);
-                    Internal.setMessage_0(__Instance, arg0);
+                    var __fixedInstance = ToInternal();
+                    Internal.setMessage_0(new global::System.IntPtr(&__fixedInstance), arg0);
                     Marshal.FreeHGlobal(arg0);
+                    FromInternal(&__fixedInstance);
                 }
             }
 
             public CppSharp.Parser.ParserDiagnosticLevel Level
             {
-                get
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    return __ptr->Level;
-                }
+                get;
 
-                set
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    __ptr->Level = value;
-                }
+                set;
             }
 
             public int LineNumber
             {
-                get
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    return __ptr->LineNumber;
-                }
+                get;
 
-                set
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    __ptr->LineNumber = value;
-                }
+                set;
             }
 
             public int ColumnNumber
             {
-                get
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    return __ptr->ColumnNumber;
-                }
+                get;
 
-                set
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    __ptr->ColumnNumber = value;
-                }
+                set;
             }
         }
 
-        public unsafe partial class ParserResult : IDisposable
+        public unsafe partial struct ParserResult
         {
             [StructLayout(LayoutKind.Explicit, Size = 28)]
             public partial struct Internal
@@ -820,118 +805,103 @@ namespace CppSharp
                 internal static extern uint getDiagnosticsCount_0(global::System.IntPtr instance);
             }
 
-            public global::System.IntPtr __Instance { get; protected set; }
-
-            internal ParserResult(ParserResult.Internal* native)
-                : this(new global::System.IntPtr(native))
-            {
-            }
-
-            private static global::System.IntPtr __CopyValue(ParserResult.Internal native)
+            public static new ParserResult __CreateInstance(global::System.IntPtr native)
             {
-                var ret = Marshal.AllocHGlobal(28);
-                CppSharp.Parser.ParserResult.Internal.cctor_1(ret, new global::System.IntPtr(&native));
-                return ret;
+                return new ParserResult((ParserResult.Internal*) native);
             }
 
             internal ParserResult(ParserResult.Internal native)
-                : this(__CopyValue(native))
-            {
-            }
-
-            public ParserResult(global::System.IntPtr native, bool isInternalImpl = false)
+                : this(&native)
             {
-                __Instance = native;
             }
 
-            public ParserResult()
+            private ParserResult(ParserResult.Internal* native, bool isInternalImpl = false) : this()
             {
-                __Instance = Marshal.AllocHGlobal(28);
-                Internal.ctor_0(__Instance);
+                var __ptr = native;
+                Kind = __ptr->Kind;
+                ASTContext = (__ptr->ASTContext == IntPtr.Zero) ? null : CppSharp.Parser.AST.ASTContext.__CreateInstance(__ptr->ASTContext);
+                Library = (__ptr->Library == IntPtr.Zero) ? null : CppSharp.Parser.AST.NativeLibrary.__CreateInstance(__ptr->Library);
             }
 
-            public void Dispose()
+            internal Internal ToInternal()
             {
-                Dispose(disposing: true);
-                GC.SuppressFinalize(this);
+                var __native = new CppSharp.Parser.ParserResult.Internal();
+                var __ptr = &__native;
+                __native.Kind = Kind;
+                if (ASTContext != null)
+                {
+                    __native.ASTContext = ASTContext == (CppSharp.Parser.AST.ASTContext) null ? global::System.IntPtr.Zero : ASTContext.__Instance;
+                }
+                if (Library != null)
+                {
+                    __native.Library = Library == (CppSharp.Parser.AST.NativeLibrary) null ? global::System.IntPtr.Zero : Library.__Instance;
+                }
+                return __native;
             }
 
-            protected virtual void Dispose(bool disposing)
+            internal void FromInternal(Internal* native)
             {
-                Internal.dtor_0(__Instance);
-                Marshal.FreeHGlobal(__Instance);
+                var __ptr = native;
+                Kind = __ptr->Kind;
+                ASTContext = (__ptr->ASTContext == IntPtr.Zero) ? null : CppSharp.Parser.AST.ASTContext.__CreateInstance(__ptr->ASTContext);
+                Library = (__ptr->Library == IntPtr.Zero) ? null : CppSharp.Parser.AST.NativeLibrary.__CreateInstance(__ptr->Library);
             }
 
             public CppSharp.Parser.ParserDiagnostic getDiagnostics(uint i)
             {
                 var __ret = new CppSharp.Parser.ParserDiagnostic.Internal();
-                Internal.getDiagnostics_0(new IntPtr(&__ret), __Instance, i);
+                var __fixedInstance = ToInternal();
+                Internal.getDiagnostics_0(new IntPtr(&__ret), new global::System.IntPtr(&__fixedInstance), i);
+                FromInternal(&__fixedInstance);
                 return new CppSharp.Parser.ParserDiagnostic(__ret);
             }
 
             public void addDiagnostics(CppSharp.Parser.ParserDiagnostic s)
             {
-                var arg0 = s == (CppSharp.Parser.ParserDiagnostic) null ? global::System.IntPtr.Zero : s.__Instance;
-                Internal.addDiagnostics_0(__Instance, arg0);
+                var __arg0 = s.ToInternal();
+                var arg0 = new global::System.IntPtr(&__arg0);
+                var __fixedInstance = ToInternal();
+                Internal.addDiagnostics_0(new global::System.IntPtr(&__fixedInstance), arg0);
+                FromInternal(&__fixedInstance);
             }
 
             public void clearDiagnostics()
             {
-                Internal.clearDiagnostics_0(__Instance);
+                var __fixedInstance = ToInternal();
+                Internal.clearDiagnostics_0(new global::System.IntPtr(&__fixedInstance));
+                FromInternal(&__fixedInstance);
             }
 
             public uint DiagnosticsCount
             {
                 get
                 {
-                    var __ret = Internal.getDiagnosticsCount_0(__Instance);
+                    var __fixedInstance = ToInternal();
+                    var __ret = Internal.getDiagnosticsCount_0(new global::System.IntPtr(&__fixedInstance));
+                    FromInternal(&__fixedInstance);
                     return __ret;
                 }
             }
 
             public CppSharp.Parser.ParserResultKind Kind
             {
-                get
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    return __ptr->Kind;
-                }
+                get;
 
-                set
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    __ptr->Kind = value;
-                }
+                set;
             }
 
             public CppSharp.Parser.AST.ASTContext ASTContext
             {
-                get
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    return (__ptr->ASTContext == IntPtr.Zero) ? null : new CppSharp.Parser.AST.ASTContext(__ptr->ASTContext);
-                }
+                get;
 
-                set
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    __ptr->ASTContext = value == (CppSharp.Parser.AST.ASTContext) null ? global::System.IntPtr.Zero : value.__Instance;
-                }
+                set;
             }
 
             public CppSharp.Parser.AST.NativeLibrary Library
             {
-                get
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    return (__ptr->Library == IntPtr.Zero) ? null : new CppSharp.Parser.AST.NativeLibrary(__ptr->Library);
-                }
+                get;
 
-                set
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    __ptr->Library = value == (CppSharp.Parser.AST.NativeLibrary) null ? global::System.IntPtr.Zero : value.__Instance;
-                }
+                set;
             }
         }
 
@@ -963,31 +933,35 @@ namespace CppSharp
 
             public global::System.IntPtr __Instance { get; protected set; }
 
-            internal ClangParser(ClangParser.Internal* native)
-                : this(new global::System.IntPtr(native))
+            private readonly bool __ownsNativeInstance;
+
+            public static new ClangParser __CreateInstance(global::System.IntPtr native)
             {
+                return new ClangParser((ClangParser.Internal*) native);
             }
 
-            private static global::System.IntPtr __CopyValue(ClangParser.Internal native)
+            private static ClangParser.Internal* __CopyValue(ClangParser.Internal native)
             {
-                global::System.IntPtr ret = Marshal.AllocHGlobal(1);
-                *(ClangParser.Internal*) ret = native;
+                ClangParser.Internal* ret = (ClangParser.Internal*) Marshal.AllocHGlobal(1);
+                *ret = native;
                 return ret;
             }
 
             internal ClangParser(ClangParser.Internal native)
                 : this(__CopyValue(native))
             {
+                __ownsNativeInstance = true;
             }
 
-            public ClangParser(global::System.IntPtr native, bool isInternalImpl = false)
+            protected ClangParser(ClangParser.Internal* native, bool isInternalImpl = false)
             {
-                __Instance = native;
+                __Instance = new global::System.IntPtr(native);
             }
 
             public ClangParser()
             {
                 __Instance = Marshal.AllocHGlobal(1);
+                __ownsNativeInstance = true;
             }
 
             public void Dispose()
@@ -998,23 +972,26 @@ namespace CppSharp
 
             protected virtual void Dispose(bool disposing)
             {
-                Marshal.FreeHGlobal(__Instance);
+                if (__ownsNativeInstance)
+                {
+                    Marshal.FreeHGlobal(__Instance);
+                }
             }
 
             public static CppSharp.Parser.ParserResult ParseHeader(CppSharp.Parser.ParserOptions Opts)
             {
                 var arg0 = Opts == (CppSharp.Parser.ParserOptions) null ? global::System.IntPtr.Zero : Opts.__Instance;
                 var __ret = Internal.ParseHeader_0(arg0);
-                if (__ret == global::System.IntPtr.Zero) return null;
-                return (__ret == IntPtr.Zero) ? null : new CppSharp.Parser.ParserResult(__ret);
+                if (__ret == global::System.IntPtr.Zero) return new CppSharp.Parser.ParserResult();
+                return (__ret == IntPtr.Zero) ? new CppSharp.Parser.ParserResult() : CppSharp.Parser.ParserResult.__CreateInstance(__ret);
             }
 
             public static CppSharp.Parser.ParserResult ParseLibrary(CppSharp.Parser.ParserOptions Opts)
             {
                 var arg0 = Opts == (CppSharp.Parser.ParserOptions) null ? global::System.IntPtr.Zero : Opts.__Instance;
                 var __ret = Internal.ParseLibrary_0(arg0);
-                if (__ret == global::System.IntPtr.Zero) return null;
-                return (__ret == IntPtr.Zero) ? null : new CppSharp.Parser.ParserResult(__ret);
+                if (__ret == global::System.IntPtr.Zero) return new CppSharp.Parser.ParserResult();
+                return (__ret == IntPtr.Zero) ? new CppSharp.Parser.ParserResult() : CppSharp.Parser.ParserResult.__CreateInstance(__ret);
             }
 
             public static CppSharp.Parser.ParserTargetInfo GetTargetInfo(CppSharp.Parser.ParserOptions Opts)
@@ -1022,7 +999,7 @@ namespace CppSharp
                 var arg0 = Opts == (CppSharp.Parser.ParserOptions) null ? global::System.IntPtr.Zero : Opts.__Instance;
                 var __ret = Internal.GetTargetInfo_0(arg0);
                 if (__ret == global::System.IntPtr.Zero) return null;
-                return (__ret == IntPtr.Zero) ? null : new CppSharp.Parser.ParserTargetInfo(__ret);
+                return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.ParserTargetInfo.__CreateInstance(__ret);
             }
         }
     }

src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Sources.cs

@@ -34,9 +34,9 @@ namespace CppSharp
                 internal static extern void cctor_2(global::System.IntPtr instance, global::System.IntPtr _0);
             }
 
-            internal SourceLocation(SourceLocation.Internal* native)
-                : this(new global::System.IntPtr(native))
+            public static new SourceLocation __CreateInstance(global::System.IntPtr native)
             {
+                return new SourceLocation((SourceLocation.Internal*) native);
             }
 
             internal SourceLocation(SourceLocation.Internal native)
@@ -44,9 +44,9 @@ namespace CppSharp
             {
             }
 
-            public SourceLocation(global::System.IntPtr native, bool isInternalImpl = false) : this()
+            private SourceLocation(SourceLocation.Internal* native, bool isInternalImpl = false) : this()
             {
-                var __ptr = (Internal*)native.ToPointer();
+                var __ptr = native;
                 ID = __ptr->ID;
             }
 

src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Target.cs

@@ -172,31 +172,35 @@ namespace CppSharp
 
             public global::System.IntPtr __Instance { get; protected set; }
 
-            internal ParserTargetInfo(ParserTargetInfo.Internal* native)
-                : this(new global::System.IntPtr(native))
+            private readonly bool __ownsNativeInstance;
+
+            public static new ParserTargetInfo __CreateInstance(global::System.IntPtr native)
             {
+                return new ParserTargetInfo((ParserTargetInfo.Internal*) native);
             }
 
-            private static global::System.IntPtr __CopyValue(ParserTargetInfo.Internal native)
+            private static ParserTargetInfo.Internal* __CopyValue(ParserTargetInfo.Internal native)
             {
                 var ret = Marshal.AllocHGlobal(164);
                 CppSharp.Parser.ParserTargetInfo.Internal.cctor_2(ret, new global::System.IntPtr(&native));
-                return ret;
+                return (ParserTargetInfo.Internal*) ret;
             }
 
             internal ParserTargetInfo(ParserTargetInfo.Internal native)
                 : this(__CopyValue(native))
             {
+                __ownsNativeInstance = true;
             }
 
-            public ParserTargetInfo(global::System.IntPtr native, bool isInternalImpl = false)
+            protected ParserTargetInfo(ParserTargetInfo.Internal* native, bool isInternalImpl = false)
             {
-                __Instance = native;
+                __Instance = new global::System.IntPtr(native);
             }
 
             public ParserTargetInfo()
             {
                 __Instance = Marshal.AllocHGlobal(164);
+                __ownsNativeInstance = true;
                 Internal.ctor_1(__Instance);
             }
 
@@ -209,7 +213,10 @@ namespace CppSharp
             protected virtual void Dispose(bool disposing)
             {
                 Internal.dtor_0(__Instance);
-                Marshal.FreeHGlobal(__Instance);
+                if (__ownsNativeInstance)
+                {
+                    Marshal.FreeHGlobal(__Instance);
+                }
             }
 
             public string ABI

src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppParser.cs

@@ -232,31 +232,35 @@ namespace CppSharp
 
             public global::System.IntPtr __Instance { get; protected set; }
 
-            internal ParserOptions(ParserOptions.Internal* native)
-                : this(new global::System.IntPtr(native))
+            private readonly bool __ownsNativeInstance;
+
+            public static new ParserOptions __CreateInstance(global::System.IntPtr native)
             {
+                return new ParserOptions((ParserOptions.Internal*) native);
             }
 
-            private static global::System.IntPtr __CopyValue(ParserOptions.Internal native)
+            private static ParserOptions.Internal* __CopyValue(ParserOptions.Internal native)
             {
                 var ret = Marshal.AllocHGlobal(140);
                 CppSharp.Parser.ParserOptions.Internal.cctor_2(ret, new global::System.IntPtr(&native));
-                return ret;
+                return (ParserOptions.Internal*) ret;
             }
 
             internal ParserOptions(ParserOptions.Internal native)
                 : this(__CopyValue(native))
             {
+                __ownsNativeInstance = true;
             }
 
-            public ParserOptions(global::System.IntPtr native, bool isInternalImpl = false)
+            protected ParserOptions(ParserOptions.Internal* native, bool isInternalImpl = false)
             {
-                __Instance = native;
+                __Instance = new global::System.IntPtr(native);
             }
 
             public ParserOptions()
             {
                 __Instance = Marshal.AllocHGlobal(140);
+                __ownsNativeInstance = true;
                 Internal.ctor_0(__Instance);
             }
 
@@ -269,7 +273,10 @@ namespace CppSharp
             protected virtual void Dispose(bool disposing)
             {
                 Internal.dtor_0(__Instance);
-                Marshal.FreeHGlobal(__Instance);
+                if (__ownsNativeInstance)
+                {
+                    Marshal.FreeHGlobal(__Instance);
+                }
             }
 
             public string getArguments(uint i)
@@ -479,7 +486,7 @@ namespace CppSharp
                 get
                 {
                     var __ptr = (Internal*)__Instance.ToPointer();
-                    return (__ptr->ASTContext == IntPtr.Zero) ? null : new CppSharp.Parser.AST.ASTContext(__ptr->ASTContext);
+                    return (__ptr->ASTContext == IntPtr.Zero) ? null : CppSharp.Parser.AST.ASTContext.__CreateInstance(__ptr->ASTContext);
                 }
 
                 set
@@ -595,7 +602,7 @@ namespace CppSharp
             }
         }
 
-        public unsafe partial class ParserDiagnostic : IDisposable
+        public unsafe partial struct ParserDiagnostic
         {
             [StructLayout(LayoutKind.Explicit, Size = 60)]
             public partial struct Internal
@@ -645,53 +652,49 @@ namespace CppSharp
                 internal static extern void setMessage_0(global::System.IntPtr instance, global::System.IntPtr s);
             }
 
-            public global::System.IntPtr __Instance { get; protected set; }
-
-            internal ParserDiagnostic(ParserDiagnostic.Internal* native)
-                : this(new global::System.IntPtr(native))
-            {
-            }
-
-            private static global::System.IntPtr __CopyValue(ParserDiagnostic.Internal native)
+            public static new ParserDiagnostic __CreateInstance(global::System.IntPtr native)
             {
-                var ret = Marshal.AllocHGlobal(60);
-                CppSharp.Parser.ParserDiagnostic.Internal.cctor_1(ret, new global::System.IntPtr(&native));
-                return ret;
+                return new ParserDiagnostic((ParserDiagnostic.Internal*) native);
             }
 
             internal ParserDiagnostic(ParserDiagnostic.Internal native)
-                : this(__CopyValue(native))
-            {
-            }
-
-            public ParserDiagnostic(global::System.IntPtr native, bool isInternalImpl = false)
+                : this(&native)
             {
-                __Instance = native;
             }
 
-            public ParserDiagnostic()
+            private ParserDiagnostic(ParserDiagnostic.Internal* native, bool isInternalImpl = false) : this()
             {
-                __Instance = Marshal.AllocHGlobal(60);
-                Internal.ctor_0(__Instance);
+                var __ptr = native;
+                Level = __ptr->Level;
+                LineNumber = __ptr->LineNumber;
+                ColumnNumber = __ptr->ColumnNumber;
             }
 
-            public void Dispose()
+            internal Internal ToInternal()
             {
-                Dispose(disposing: true);
-                GC.SuppressFinalize(this);
+                var __native = new CppSharp.Parser.ParserDiagnostic.Internal();
+                var __ptr = &__native;
+                __native.Level = Level;
+                __native.LineNumber = LineNumber;
+                __native.ColumnNumber = ColumnNumber;
+                return __native;
             }
 
-            protected virtual void Dispose(bool disposing)
+            internal void FromInternal(Internal* native)
             {
-                Internal.dtor_0(__Instance);
-                Marshal.FreeHGlobal(__Instance);
+                var __ptr = native;
+                Level = __ptr->Level;
+                LineNumber = __ptr->LineNumber;
+                ColumnNumber = __ptr->ColumnNumber;
             }
 
             public string FileName
             {
                 get
                 {
-                    var __ret = Internal.getFileName_0(__Instance);
+                    var __fixedInstance = ToInternal();
+                    var __ret = Internal.getFileName_0(new global::System.IntPtr(&__fixedInstance));
+                    FromInternal(&__fixedInstance);
                     if (__ret == global::System.IntPtr.Zero) return null;
                     return Marshal.PtrToStringAnsi(__ret);
                 }
@@ -699,8 +702,10 @@ namespace CppSharp
                 set
                 {
                     var arg0 = Marshal.StringToHGlobalAnsi(value);
-                    Internal.setFileName_0(__Instance, arg0);
+                    var __fixedInstance = ToInternal();
+                    Internal.setFileName_0(new global::System.IntPtr(&__fixedInstance), arg0);
                     Marshal.FreeHGlobal(arg0);
+                    FromInternal(&__fixedInstance);
                 }
             }
 
@@ -708,7 +713,9 @@ namespace CppSharp
             {
                 get
                 {
-                    var __ret = Internal.getMessage_0(__Instance);
+                    var __fixedInstance = ToInternal();
+                    var __ret = Internal.getMessage_0(new global::System.IntPtr(&__fixedInstance));
+                    FromInternal(&__fixedInstance);
                     if (__ret == global::System.IntPtr.Zero) return null;
                     return Marshal.PtrToStringAnsi(__ret);
                 }
@@ -716,58 +723,36 @@ namespace CppSharp
                 set
                 {
                     var arg0 = Marshal.StringToHGlobalAnsi(value);
-                    Internal.setMessage_0(__Instance, arg0);
+                    var __fixedInstance = ToInternal();
+                    Internal.setMessage_0(new global::System.IntPtr(&__fixedInstance), arg0);
                     Marshal.FreeHGlobal(arg0);
+                    FromInternal(&__fixedInstance);
                 }
             }
 
             public CppSharp.Parser.ParserDiagnosticLevel Level
             {
-                get
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    return __ptr->Level;
-                }
+                get;
 
-                set
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    __ptr->Level = value;
-                }
+                set;
             }
 
             public int LineNumber
             {
-                get
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    return __ptr->LineNumber;
-                }
+                get;
 
-                set
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    __ptr->LineNumber = value;
-                }
+                set;
             }
 
             public int ColumnNumber
             {
-                get
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    return __ptr->ColumnNumber;
-                }
+                get;
 
-                set
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    __ptr->ColumnNumber = value;
-                }
+                set;
             }
         }
 
-        public unsafe partial class ParserResult : IDisposable
+        public unsafe partial struct ParserResult
         {
             [StructLayout(LayoutKind.Explicit, Size = 28)]
             public partial struct Internal
@@ -820,118 +805,103 @@ namespace CppSharp
                 internal static extern uint getDiagnosticsCount_0(global::System.IntPtr instance);
             }
 
-            public global::System.IntPtr __Instance { get; protected set; }
-
-            internal ParserResult(ParserResult.Internal* native)
-                : this(new global::System.IntPtr(native))
-            {
-            }
-
-            private static global::System.IntPtr __CopyValue(ParserResult.Internal native)
+            public static new ParserResult __CreateInstance(global::System.IntPtr native)
             {
-                var ret = Marshal.AllocHGlobal(28);
-                CppSharp.Parser.ParserResult.Internal.cctor_1(ret, new global::System.IntPtr(&native));
-                return ret;
+                return new ParserResult((ParserResult.Internal*) native);
             }
 
             internal ParserResult(ParserResult.Internal native)
-                : this(__CopyValue(native))
-            {
-            }
-
-            public ParserResult(global::System.IntPtr native, bool isInternalImpl = false)
+                : this(&native)
             {
-                __Instance = native;
             }
 
-            public ParserResult()
+            private ParserResult(ParserResult.Internal* native, bool isInternalImpl = false) : this()
             {
-                __Instance = Marshal.AllocHGlobal(28);
-                Internal.ctor_0(__Instance);
+                var __ptr = native;
+                Kind = __ptr->Kind;
+                ASTContext = (__ptr->ASTContext == IntPtr.Zero) ? null : CppSharp.Parser.AST.ASTContext.__CreateInstance(__ptr->ASTContext);
+                Library = (__ptr->Library == IntPtr.Zero) ? null : CppSharp.Parser.AST.NativeLibrary.__CreateInstance(__ptr->Library);
             }
 
-            public void Dispose()
+            internal Internal ToInternal()
             {
-                Dispose(disposing: true);
-                GC.SuppressFinalize(this);
+                var __native = new CppSharp.Parser.ParserResult.Internal();
+                var __ptr = &__native;
+                __native.Kind = Kind;
+                if (ASTContext != null)
+                {
+                    __native.ASTContext = ASTContext == (CppSharp.Parser.AST.ASTContext) null ? global::System.IntPtr.Zero : ASTContext.__Instance;
+                }
+                if (Library != null)
+                {
+                    __native.Library = Library == (CppSharp.Parser.AST.NativeLibrary) null ? global::System.IntPtr.Zero : Library.__Instance;
+                }
+                return __native;
             }
 
-            protected virtual void Dispose(bool disposing)
+            internal void FromInternal(Internal* native)
             {
-                Internal.dtor_0(__Instance);
-                Marshal.FreeHGlobal(__Instance);
+                var __ptr = native;
+                Kind = __ptr->Kind;
+                ASTContext = (__ptr->ASTContext == IntPtr.Zero) ? null : CppSharp.Parser.AST.ASTContext.__CreateInstance(__ptr->ASTContext);
+                Library = (__ptr->Library == IntPtr.Zero) ? null : CppSharp.Parser.AST.NativeLibrary.__CreateInstance(__ptr->Library);
             }
 
             public CppSharp.Parser.ParserDiagnostic getDiagnostics(uint i)
             {
                 var __ret = new CppSharp.Parser.ParserDiagnostic.Internal();
-                Internal.getDiagnostics_0(__Instance, new IntPtr(&__ret), i);
+                var __fixedInstance = ToInternal();
+                Internal.getDiagnostics_0(new global::System.IntPtr(&__fixedInstance), new IntPtr(&__ret), i);
+                FromInternal(&__fixedInstance);
                 return new CppSharp.Parser.ParserDiagnostic(__ret);
             }
 
             public void addDiagnostics(CppSharp.Parser.ParserDiagnostic s)
             {
-                var arg0 = s == (CppSharp.Parser.ParserDiagnostic) null ? global::System.IntPtr.Zero : s.__Instance;
-                Internal.addDiagnostics_0(__Instance, arg0);
+                var __arg0 = s.ToInternal();
+                var arg0 = new global::System.IntPtr(&__arg0);
+                var __fixedInstance = ToInternal();
+                Internal.addDiagnostics_0(new global::System.IntPtr(&__fixedInstance), arg0);
+                FromInternal(&__fixedInstance);
             }
 
             public void clearDiagnostics()
             {
-                Internal.clearDiagnostics_0(__Instance);
+                var __fixedInstance = ToInternal();
+                Internal.clearDiagnostics_0(new global::System.IntPtr(&__fixedInstance));
+                FromInternal(&__fixedInstance);
             }
 
             public uint DiagnosticsCount
             {
                 get
                 {
-                    var __ret = Internal.getDiagnosticsCount_0(__Instance);
+                    var __fixedInstance = ToInternal();
+                    var __ret = Internal.getDiagnosticsCount_0(new global::System.IntPtr(&__fixedInstance));
+                    FromInternal(&__fixedInstance);
                     return __ret;
                 }
             }
 
             public CppSharp.Parser.ParserResultKind Kind
             {
-                get
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    return __ptr->Kind;
-                }
+                get;
 
-                set
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    __ptr->Kind = value;
-                }
+                set;
             }
 
             public CppSharp.Parser.AST.ASTContext ASTContext
             {
-                get
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    return (__ptr->ASTContext == IntPtr.Zero) ? null : new CppSharp.Parser.AST.ASTContext(__ptr->ASTContext);
-                }
+                get;
 
-                set
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    __ptr->ASTContext = value == (CppSharp.Parser.AST.ASTContext) null ? global::System.IntPtr.Zero : value.__Instance;
-                }
+                set;
             }
 
             public CppSharp.Parser.AST.NativeLibrary Library
             {
-                get
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    return (__ptr->Library == IntPtr.Zero) ? null : new CppSharp.Parser.AST.NativeLibrary(__ptr->Library);
-                }
+                get;
 
-                set
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    __ptr->Library = value == (CppSharp.Parser.AST.NativeLibrary) null ? global::System.IntPtr.Zero : value.__Instance;
-                }
+                set;
             }
         }
 
@@ -963,31 +933,35 @@ namespace CppSharp
 
             public global::System.IntPtr __Instance { get; protected set; }
 
-            internal ClangParser(ClangParser.Internal* native)
-                : this(new global::System.IntPtr(native))
+            private readonly bool __ownsNativeInstance;
+
+            public static new ClangParser __CreateInstance(global::System.IntPtr native)
             {
+                return new ClangParser((ClangParser.Internal*) native);
             }
 
-            private static global::System.IntPtr __CopyValue(ClangParser.Internal native)
+            private static ClangParser.Internal* __CopyValue(ClangParser.Internal native)
             {
-                global::System.IntPtr ret = Marshal.AllocHGlobal(1);
-                *(ClangParser.Internal*) ret = native;
+                ClangParser.Internal* ret = (ClangParser.Internal*) Marshal.AllocHGlobal(1);
+                *ret = native;
                 return ret;
             }
 
             internal ClangParser(ClangParser.Internal native)
                 : this(__CopyValue(native))
             {
+                __ownsNativeInstance = true;
             }
 
-            public ClangParser(global::System.IntPtr native, bool isInternalImpl = false)
+            protected ClangParser(ClangParser.Internal* native, bool isInternalImpl = false)
             {
-                __Instance = native;
+                __Instance = new global::System.IntPtr(native);
             }
 
             public ClangParser()
             {
                 __Instance = Marshal.AllocHGlobal(1);
+                __ownsNativeInstance = true;
             }
 
             public void Dispose()
@@ -998,23 +972,26 @@ namespace CppSharp
 
             protected virtual void Dispose(bool disposing)
             {
-                Marshal.FreeHGlobal(__Instance);
+                if (__ownsNativeInstance)
+                {
+                    Marshal.FreeHGlobal(__Instance);
+                }
             }
 
             public static CppSharp.Parser.ParserResult ParseHeader(CppSharp.Parser.ParserOptions Opts)
             {
                 var arg0 = Opts == (CppSharp.Parser.ParserOptions) null ? global::System.IntPtr.Zero : Opts.__Instance;
                 var __ret = Internal.ParseHeader_0(arg0);
-                if (__ret == global::System.IntPtr.Zero) return null;
-                return (__ret == IntPtr.Zero) ? null : new CppSharp.Parser.ParserResult(__ret);
+                if (__ret == global::System.IntPtr.Zero) return new CppSharp.Parser.ParserResult();
+                return (__ret == IntPtr.Zero) ? new CppSharp.Parser.ParserResult() : CppSharp.Parser.ParserResult.__CreateInstance(__ret);
             }
 
             public static CppSharp.Parser.ParserResult ParseLibrary(CppSharp.Parser.ParserOptions Opts)
             {
                 var arg0 = Opts == (CppSharp.Parser.ParserOptions) null ? global::System.IntPtr.Zero : Opts.__Instance;
                 var __ret = Internal.ParseLibrary_0(arg0);
-                if (__ret == global::System.IntPtr.Zero) return null;
-                return (__ret == IntPtr.Zero) ? null : new CppSharp.Parser.ParserResult(__ret);
+                if (__ret == global::System.IntPtr.Zero) return new CppSharp.Parser.ParserResult();
+                return (__ret == IntPtr.Zero) ? new CppSharp.Parser.ParserResult() : CppSharp.Parser.ParserResult.__CreateInstance(__ret);
             }
 
             public static CppSharp.Parser.ParserTargetInfo GetTargetInfo(CppSharp.Parser.ParserOptions Opts)
@@ -1022,7 +999,7 @@ namespace CppSharp
                 var arg0 = Opts == (CppSharp.Parser.ParserOptions) null ? global::System.IntPtr.Zero : Opts.__Instance;
                 var __ret = Internal.GetTargetInfo_0(arg0);
                 if (__ret == global::System.IntPtr.Zero) return null;
-                return (__ret == IntPtr.Zero) ? null : new CppSharp.Parser.ParserTargetInfo(__ret);
+                return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.ParserTargetInfo.__CreateInstance(__ret);
             }
         }
     }

src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Sources.cs

@@ -34,9 +34,9 @@ namespace CppSharp
                 internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0);
             }
 
-            internal SourceLocation(SourceLocation.Internal* native)
-                : this(new global::System.IntPtr(native))
+            public static new SourceLocation __CreateInstance(global::System.IntPtr native)
             {
+                return new SourceLocation((SourceLocation.Internal*) native);
             }
 
             internal SourceLocation(SourceLocation.Internal native)
@@ -44,9 +44,9 @@ namespace CppSharp
             {
             }
 
-            public SourceLocation(global::System.IntPtr native, bool isInternalImpl = false) : this()
+            private SourceLocation(SourceLocation.Internal* native, bool isInternalImpl = false) : this()
             {
-                var __ptr = (Internal*)native.ToPointer();
+                var __ptr = native;
                 ID = __ptr->ID;
             }
 

src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Target.cs

@@ -172,31 +172,35 @@ namespace CppSharp
 
             public global::System.IntPtr __Instance { get; protected set; }
 
-            internal ParserTargetInfo(ParserTargetInfo.Internal* native)
-                : this(new global::System.IntPtr(native))
+            private readonly bool __ownsNativeInstance;
+
+            public static new ParserTargetInfo __CreateInstance(global::System.IntPtr native)
             {
+                return new ParserTargetInfo((ParserTargetInfo.Internal*) native);
             }
 
-            private static global::System.IntPtr __CopyValue(ParserTargetInfo.Internal native)
+            private static ParserTargetInfo.Internal* __CopyValue(ParserTargetInfo.Internal native)
             {
                 var ret = Marshal.AllocHGlobal(176);
                 CppSharp.Parser.ParserTargetInfo.Internal.cctor_2(ret, new global::System.IntPtr(&native));
-                return ret;
+                return (ParserTargetInfo.Internal*) ret;
             }
 
             internal ParserTargetInfo(ParserTargetInfo.Internal native)
                 : this(__CopyValue(native))
             {
+                __ownsNativeInstance = true;
             }
 
-            public ParserTargetInfo(global::System.IntPtr native, bool isInternalImpl = false)
+            protected ParserTargetInfo(ParserTargetInfo.Internal* native, bool isInternalImpl = false)
             {
-                __Instance = native;
+                __Instance = new global::System.IntPtr(native);
             }
 
             public ParserTargetInfo()
             {
                 __Instance = Marshal.AllocHGlobal(176);
+                __ownsNativeInstance = true;
                 Internal.ctor_1(__Instance);
             }
 
@@ -209,7 +213,10 @@ namespace CppSharp
             protected virtual void Dispose(bool disposing)
             {
                 Internal.dtor_0(__Instance);
-                Marshal.FreeHGlobal(__Instance);
+                if (__ownsNativeInstance)
+                {
+                    Marshal.FreeHGlobal(__Instance);
+                }
             }
 
             public string ABI

src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppParser.cs

@@ -232,31 +232,35 @@ namespace CppSharp
 
             public global::System.IntPtr __Instance { get; protected set; }
 
-            internal ParserOptions(ParserOptions.Internal* native)
-                : this(new global::System.IntPtr(native))
+            private readonly bool __ownsNativeInstance;
+
+            public static new ParserOptions __CreateInstance(global::System.IntPtr native)
             {
+                return new ParserOptions((ParserOptions.Internal*) native);
             }
 
-            private static global::System.IntPtr __CopyValue(ParserOptions.Internal native)
+            private static ParserOptions.Internal* __CopyValue(ParserOptions.Internal native)
             {
                 var ret = Marshal.AllocHGlobal(192);
                 CppSharp.Parser.ParserOptions.Internal.cctor_1(ret, new global::System.IntPtr(&native));
-                return ret;
+                return (ParserOptions.Internal*) ret;
             }
 
             internal ParserOptions(ParserOptions.Internal native)
                 : this(__CopyValue(native))
             {
+                __ownsNativeInstance = true;
             }
 
-            public ParserOptions(global::System.IntPtr native, bool isInternalImpl = false)
+            protected ParserOptions(ParserOptions.Internal* native, bool isInternalImpl = false)
             {
-                __Instance = native;
+                __Instance = new global::System.IntPtr(native);
             }
 
             public ParserOptions()
             {
                 __Instance = Marshal.AllocHGlobal(192);
+                __ownsNativeInstance = true;
                 Internal.ctor_0(__Instance);
             }
 
@@ -269,7 +273,10 @@ namespace CppSharp
             protected virtual void Dispose(bool disposing)
             {
                 Internal.dtor_0(__Instance);
-                Marshal.FreeHGlobal(__Instance);
+                if (__ownsNativeInstance)
+                {
+                    Marshal.FreeHGlobal(__Instance);
+                }
             }
 
             public string getArguments(uint i)
@@ -479,7 +486,7 @@ namespace CppSharp
                 get
                 {
                     var __ptr = (Internal*)__Instance.ToPointer();
-                    return (__ptr->ASTContext == IntPtr.Zero) ? null : new CppSharp.Parser.AST.ASTContext(__ptr->ASTContext);
+                    return (__ptr->ASTContext == IntPtr.Zero) ? null : CppSharp.Parser.AST.ASTContext.__CreateInstance(__ptr->ASTContext);
                 }
 
                 set
@@ -595,7 +602,7 @@ namespace CppSharp
             }
         }
 
-        public unsafe partial class ParserDiagnostic : IDisposable
+        public unsafe partial struct ParserDiagnostic
         {
             [StructLayout(LayoutKind.Explicit, Size = 32)]
             public partial struct Internal
@@ -645,53 +652,49 @@ namespace CppSharp
                 internal static extern void setMessage_0(global::System.IntPtr instance, global::System.IntPtr s);
             }
 
-            public global::System.IntPtr __Instance { get; protected set; }
-
-            internal ParserDiagnostic(ParserDiagnostic.Internal* native)
-                : this(new global::System.IntPtr(native))
-            {
-            }
-
-            private static global::System.IntPtr __CopyValue(ParserDiagnostic.Internal native)
+            public static new ParserDiagnostic __CreateInstance(global::System.IntPtr native)
             {
-                var ret = Marshal.AllocHGlobal(32);
-                CppSharp.Parser.ParserDiagnostic.Internal.cctor_1(ret, new global::System.IntPtr(&native));
-                return ret;
+                return new ParserDiagnostic((ParserDiagnostic.Internal*) native);
             }
 
             internal ParserDiagnostic(ParserDiagnostic.Internal native)
-                : this(__CopyValue(native))
-            {
-            }
-
-            public ParserDiagnostic(global::System.IntPtr native, bool isInternalImpl = false)
+                : this(&native)
             {
-                __Instance = native;
             }
 
-            public ParserDiagnostic()
+            private ParserDiagnostic(ParserDiagnostic.Internal* native, bool isInternalImpl = false) : this()
             {
-                __Instance = Marshal.AllocHGlobal(32);
-                Internal.ctor_0(__Instance);
+                var __ptr = native;
+                Level = __ptr->Level;
+                LineNumber = __ptr->LineNumber;
+                ColumnNumber = __ptr->ColumnNumber;
             }
 
-            public void Dispose()
+            internal Internal ToInternal()
             {
-                Dispose(disposing: true);
-                GC.SuppressFinalize(this);
+                var __native = new CppSharp.Parser.ParserDiagnostic.Internal();
+                var __ptr = &__native;
+                __native.Level = Level;
+                __native.LineNumber = LineNumber;
+                __native.ColumnNumber = ColumnNumber;
+                return __native;
             }
 
-            protected virtual void Dispose(bool disposing)
+            internal void FromInternal(Internal* native)
             {
-                Internal.dtor_0(__Instance);
-                Marshal.FreeHGlobal(__Instance);
+                var __ptr = native;
+                Level = __ptr->Level;
+                LineNumber = __ptr->LineNumber;
+                ColumnNumber = __ptr->ColumnNumber;
             }
 
             public string FileName
             {
                 get
                 {
-                    var __ret = Internal.getFileName_0(__Instance);
+                    var __fixedInstance = ToInternal();
+                    var __ret = Internal.getFileName_0(new global::System.IntPtr(&__fixedInstance));
+                    FromInternal(&__fixedInstance);
                     if (__ret == global::System.IntPtr.Zero) return null;
                     return Marshal.PtrToStringAnsi(__ret);
                 }
@@ -699,8 +702,10 @@ namespace CppSharp
                 set
                 {
                     var arg0 = Marshal.StringToHGlobalAnsi(value);
-                    Internal.setFileName_0(__Instance, arg0);
+                    var __fixedInstance = ToInternal();
+                    Internal.setFileName_0(new global::System.IntPtr(&__fixedInstance), arg0);
                     Marshal.FreeHGlobal(arg0);
+                    FromInternal(&__fixedInstance);
                 }
             }
 
@@ -708,7 +713,9 @@ namespace CppSharp
             {
                 get
                 {
-                    var __ret = Internal.getMessage_0(__Instance);
+                    var __fixedInstance = ToInternal();
+                    var __ret = Internal.getMessage_0(new global::System.IntPtr(&__fixedInstance));
+                    FromInternal(&__fixedInstance);
                     if (__ret == global::System.IntPtr.Zero) return null;
                     return Marshal.PtrToStringAnsi(__ret);
                 }
@@ -716,58 +723,36 @@ namespace CppSharp
                 set
                 {
                     var arg0 = Marshal.StringToHGlobalAnsi(value);
-                    Internal.setMessage_0(__Instance, arg0);
+                    var __fixedInstance = ToInternal();
+                    Internal.setMessage_0(new global::System.IntPtr(&__fixedInstance), arg0);
                     Marshal.FreeHGlobal(arg0);
+                    FromInternal(&__fixedInstance);
                 }
             }
 
             public CppSharp.Parser.ParserDiagnosticLevel Level
             {
-                get
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    return __ptr->Level;
-                }
+                get;
 
-                set
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    __ptr->Level = value;
-                }
+                set;
             }
 
             public int LineNumber
             {
-                get
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    return __ptr->LineNumber;
-                }
+                get;
 
-                set
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    __ptr->LineNumber = value;
-                }
+                set;
             }
 
             public int ColumnNumber
             {
-                get
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    return __ptr->ColumnNumber;
-                }
+                get;
 
-                set
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    __ptr->ColumnNumber = value;
-                }
+                set;
             }
         }
 
-        public unsafe partial class ParserResult : IDisposable
+        public unsafe partial struct ParserResult
         {
             [StructLayout(LayoutKind.Explicit, Size = 56)]
             public partial struct Internal
@@ -820,118 +805,103 @@ namespace CppSharp
                 internal static extern uint getDiagnosticsCount_0(global::System.IntPtr instance);
             }
 
-            public global::System.IntPtr __Instance { get; protected set; }
-
-            internal ParserResult(ParserResult.Internal* native)
-                : this(new global::System.IntPtr(native))
-            {
-            }
-
-            private static global::System.IntPtr __CopyValue(ParserResult.Internal native)
+            public static new ParserResult __CreateInstance(global::System.IntPtr native)
             {
-                var ret = Marshal.AllocHGlobal(56);
-                CppSharp.Parser.ParserResult.Internal.cctor_1(ret, new global::System.IntPtr(&native));
-                return ret;
+                return new ParserResult((ParserResult.Internal*) native);
             }
 
             internal ParserResult(ParserResult.Internal native)
-                : this(__CopyValue(native))
-            {
-            }
-
-            public ParserResult(global::System.IntPtr native, bool isInternalImpl = false)
+                : this(&native)
             {
-                __Instance = native;
             }
 
-            public ParserResult()
+            private ParserResult(ParserResult.Internal* native, bool isInternalImpl = false) : this()
             {
-                __Instance = Marshal.AllocHGlobal(56);
-                Internal.ctor_0(__Instance);
+                var __ptr = native;
+                Kind = __ptr->Kind;
+                ASTContext = (__ptr->ASTContext == IntPtr.Zero) ? null : CppSharp.Parser.AST.ASTContext.__CreateInstance(__ptr->ASTContext);
+                Library = (__ptr->Library == IntPtr.Zero) ? null : CppSharp.Parser.AST.NativeLibrary.__CreateInstance(__ptr->Library);
             }
 
-            public void Dispose()
+            internal Internal ToInternal()
             {
-                Dispose(disposing: true);
-                GC.SuppressFinalize(this);
+                var __native = new CppSharp.Parser.ParserResult.Internal();
+                var __ptr = &__native;
+                __native.Kind = Kind;
+                if (ASTContext != null)
+                {
+                    __native.ASTContext = ASTContext == (CppSharp.Parser.AST.ASTContext) null ? global::System.IntPtr.Zero : ASTContext.__Instance;
+                }
+                if (Library != null)
+                {
+                    __native.Library = Library == (CppSharp.Parser.AST.NativeLibrary) null ? global::System.IntPtr.Zero : Library.__Instance;
+                }
+                return __native;
             }
 
-            protected virtual void Dispose(bool disposing)
+            internal void FromInternal(Internal* native)
             {
-                Internal.dtor_0(__Instance);
-                Marshal.FreeHGlobal(__Instance);
+                var __ptr = native;
+                Kind = __ptr->Kind;
+                ASTContext = (__ptr->ASTContext == IntPtr.Zero) ? null : CppSharp.Parser.AST.ASTContext.__CreateInstance(__ptr->ASTContext);
+                Library = (__ptr->Library == IntPtr.Zero) ? null : CppSharp.Parser.AST.NativeLibrary.__CreateInstance(__ptr->Library);
             }
 
             public CppSharp.Parser.ParserDiagnostic getDiagnostics(uint i)
             {
                 var __ret = new CppSharp.Parser.ParserDiagnostic.Internal();
-                Internal.getDiagnostics_0(new IntPtr(&__ret), __Instance, i);
+                var __fixedInstance = ToInternal();
+                Internal.getDiagnostics_0(new IntPtr(&__ret), new global::System.IntPtr(&__fixedInstance), i);
+                FromInternal(&__fixedInstance);
                 return new CppSharp.Parser.ParserDiagnostic(__ret);
             }
 
             public void addDiagnostics(CppSharp.Parser.ParserDiagnostic s)
             {
-                var arg0 = s == (CppSharp.Parser.ParserDiagnostic) null ? global::System.IntPtr.Zero : s.__Instance;
-                Internal.addDiagnostics_0(__Instance, arg0);
+                var __arg0 = s.ToInternal();
+                var arg0 = new global::System.IntPtr(&__arg0);
+                var __fixedInstance = ToInternal();
+                Internal.addDiagnostics_0(new global::System.IntPtr(&__fixedInstance), arg0);
+                FromInternal(&__fixedInstance);
             }
 
             public void clearDiagnostics()
             {
-                Internal.clearDiagnostics_0(__Instance);
+                var __fixedInstance = ToInternal();
+                Internal.clearDiagnostics_0(new global::System.IntPtr(&__fixedInstance));
+                FromInternal(&__fixedInstance);
             }
 
             public uint DiagnosticsCount
             {
                 get
                 {
-                    var __ret = Internal.getDiagnosticsCount_0(__Instance);
+                    var __fixedInstance = ToInternal();
+                    var __ret = Internal.getDiagnosticsCount_0(new global::System.IntPtr(&__fixedInstance));
+                    FromInternal(&__fixedInstance);
                     return __ret;
                 }
             }
 
             public CppSharp.Parser.ParserResultKind Kind
             {
-                get
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    return __ptr->Kind;
-                }
+                get;
 
-                set
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    __ptr->Kind = value;
-                }
+                set;
             }
 
             public CppSharp.Parser.AST.ASTContext ASTContext
             {
-                get
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    return (__ptr->ASTContext == IntPtr.Zero) ? null : new CppSharp.Parser.AST.ASTContext(__ptr->ASTContext);
-                }
+                get;
 
-                set
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    __ptr->ASTContext = value == (CppSharp.Parser.AST.ASTContext) null ? global::System.IntPtr.Zero : value.__Instance;
-                }
+                set;
             }
 
             public CppSharp.Parser.AST.NativeLibrary Library
             {
-                get
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    return (__ptr->Library == IntPtr.Zero) ? null : new CppSharp.Parser.AST.NativeLibrary(__ptr->Library);
-                }
+                get;
 
-                set
-                {
-                    var __ptr = (Internal*)__Instance.ToPointer();
-                    __ptr->Library = value == (CppSharp.Parser.AST.NativeLibrary) null ? global::System.IntPtr.Zero : value.__Instance;
-                }
+                set;
             }
         }
 
@@ -963,31 +933,35 @@ namespace CppSharp
 
             public global::System.IntPtr __Instance { get; protected set; }
 
-            internal ClangParser(ClangParser.Internal* native)
-                : this(new global::System.IntPtr(native))
+            private readonly bool __ownsNativeInstance;
+
+            public static new ClangParser __CreateInstance(global::System.IntPtr native)
             {
+                return new ClangParser((ClangParser.Internal*) native);
             }
 
-            private static global::System.IntPtr __CopyValue(ClangParser.Internal native)
+            private static ClangParser.Internal* __CopyValue(ClangParser.Internal native)
             {
-                global::System.IntPtr ret = Marshal.AllocHGlobal(1);
-                *(ClangParser.Internal*) ret = native;
+                ClangParser.Internal* ret = (ClangParser.Internal*) Marshal.AllocHGlobal(1);
+                *ret = native;
                 return ret;
             }
 
             internal ClangParser(ClangParser.Internal native)
                 : this(__CopyValue(native))
             {
+                __ownsNativeInstance = true;
             }
 
-            public ClangParser(global::System.IntPtr native, bool isInternalImpl = false)
+            protected ClangParser(ClangParser.Internal* native, bool isInternalImpl = false)
             {
-                __Instance = native;
+                __Instance = new global::System.IntPtr(native);
             }
 
             public ClangParser()
             {
                 __Instance = Marshal.AllocHGlobal(1);
+                __ownsNativeInstance = true;
             }
 
             public void Dispose()
@@ -998,23 +972,26 @@ namespace CppSharp
 
             protected virtual void Dispose(bool disposing)
             {
-                Marshal.FreeHGlobal(__Instance);
+                if (__ownsNativeInstance)
+                {
+                    Marshal.FreeHGlobal(__Instance);
+                }
             }
 
             public static CppSharp.Parser.ParserResult ParseHeader(CppSharp.Parser.ParserOptions Opts)
             {
                 var arg0 = Opts == (CppSharp.Parser.ParserOptions) null ? global::System.IntPtr.Zero : Opts.__Instance;
                 var __ret = Internal.ParseHeader_0(arg0);
-                if (__ret == global::System.IntPtr.Zero) return null;
-                return (__ret == IntPtr.Zero) ? null : new CppSharp.Parser.ParserResult(__ret);
+                if (__ret == global::System.IntPtr.Zero) return new CppSharp.Parser.ParserResult();
+                return (__ret == IntPtr.Zero) ? new CppSharp.Parser.ParserResult() : CppSharp.Parser.ParserResult.__CreateInstance(__ret);
             }
 
             public static CppSharp.Parser.ParserResult ParseLibrary(CppSharp.Parser.ParserOptions Opts)
             {
                 var arg0 = Opts == (CppSharp.Parser.ParserOptions) null ? global::System.IntPtr.Zero : Opts.__Instance;
                 var __ret = Internal.ParseLibrary_0(arg0);
-                if (__ret == global::System.IntPtr.Zero) return null;
-                return (__ret == IntPtr.Zero) ? null : new CppSharp.Parser.ParserResult(__ret);
+                if (__ret == global::System.IntPtr.Zero) return new CppSharp.Parser.ParserResult();
+                return (__ret == IntPtr.Zero) ? new CppSharp.Parser.ParserResult() : CppSharp.Parser.ParserResult.__CreateInstance(__ret);
             }
 
             public static CppSharp.Parser.ParserTargetInfo GetTargetInfo(CppSharp.Parser.ParserOptions Opts)
@@ -1022,7 +999,7 @@ namespace CppSharp
                 var arg0 = Opts == (CppSharp.Parser.ParserOptions) null ? global::System.IntPtr.Zero : Opts.__Instance;
                 var __ret = Internal.GetTargetInfo_0(arg0);
                 if (__ret == global::System.IntPtr.Zero) return null;
-                return (__ret == IntPtr.Zero) ? null : new CppSharp.Parser.ParserTargetInfo(__ret);
+                return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.ParserTargetInfo.__CreateInstance(__ret);
             }
         }
     }

src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Sources.cs

@@ -34,9 +34,9 @@ namespace CppSharp
                 internal static extern void cctor_2(global::System.IntPtr instance, global::System.IntPtr _0);
             }
 
-            internal SourceLocation(SourceLocation.Internal* native)
-                : this(new global::System.IntPtr(native))
+            public static new SourceLocation __CreateInstance(global::System.IntPtr native)
             {
+                return new SourceLocation((SourceLocation.Internal*) native);
             }
 
             internal SourceLocation(SourceLocation.Internal native)
@@ -44,9 +44,9 @@ namespace CppSharp
             {
             }
 
-            public SourceLocation(global::System.IntPtr native, bool isInternalImpl = false) : this()
+            private SourceLocation(SourceLocation.Internal* native, bool isInternalImpl = false) : this()
             {
-                var __ptr = (Internal*)native.ToPointer();
+                var __ptr = native;
                 ID = __ptr->ID;
             }
 

src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Target.cs

@@ -172,31 +172,35 @@ namespace CppSharp
 
             public global::System.IntPtr __Instance { get; protected set; }
 
-            internal ParserTargetInfo(ParserTargetInfo.Internal* native)
-                : this(new global::System.IntPtr(native))
+            private readonly bool __ownsNativeInstance;
+
+            public static new ParserTargetInfo __CreateInstance(global::System.IntPtr native)
             {
+                return new ParserTargetInfo((ParserTargetInfo.Internal*) native);
             }
 
-            private static global::System.IntPtr __CopyValue(ParserTargetInfo.Internal native)
+            private static ParserTargetInfo.Internal* __CopyValue(ParserTargetInfo.Internal native)
             {
                 var ret = Marshal.AllocHGlobal(160);
                 CppSharp.Parser.ParserTargetInfo.Internal.cctor_0(ret, new global::System.IntPtr(&native));
-                return ret;
+                return (ParserTargetInfo.Internal*) ret;
             }
 
             internal ParserTargetInfo(ParserTargetInfo.Internal native)
                 : this(__CopyValue(native))
             {
+                __ownsNativeInstance = true;
             }
 
-            public ParserTargetInfo(global::System.IntPtr native, bool isInternalImpl = false)
+            protected ParserTargetInfo(ParserTargetInfo.Internal* native, bool isInternalImpl = false)
             {
-                __Instance = native;
+                __Instance = new global::System.IntPtr(native);
             }
 
             public ParserTargetInfo()
             {
                 __Instance = Marshal.AllocHGlobal(160);
+                __ownsNativeInstance = true;
                 Internal.ctor_2(__Instance);
             }
 
@@ -209,7 +213,10 @@ namespace CppSharp
             protected virtual void Dispose(bool disposing)
             {
                 Internal.dtor_0(__Instance);
-                Marshal.FreeHGlobal(__Instance);
+                if (__ownsNativeInstance)
+                {
+                    Marshal.FreeHGlobal(__Instance);
+                }
             }
 
             public string ABI

src/CppParser/Bindings/ParserGen.cs

@@ -125,7 +125,6 @@ namespace CppSharp
 
         public void Preprocess(Driver driver, ASTContext ctx)
         {
-            ctx.SetClassAsValueType("CppSharp::ParserOptions");
             ctx.SetClassAsValueType("CppSharp::ParserDiagnostic");
             ctx.SetClassAsValueType("CppSharp::ParserResult");