Re-generated the parser bindings.

src/CppParser/Bindings/CLI/AST.cpp

@@ -915,78 +915,6 @@ void CppSharp::Parser::AST::BuiltinType::Type::set(CppSharp::Parser::AST::Primit
     ((::CppSharp::CppParser::AST::BuiltinType*)NativePtr)->Type = (::CppSharp::CppParser::AST::PrimitiveType)value;
 }
 
-CppSharp::Parser::AST::RawComment::RawComment(::CppSharp::CppParser::AST::RawComment* native)
-{
-    NativePtr = native;
-}
-
-CppSharp::Parser::AST::RawComment::RawComment(System::IntPtr native)
-{
-    auto __native = (::CppSharp::CppParser::AST::RawComment*)native.ToPointer();
-    NativePtr = __native;
-}
-
-CppSharp::Parser::AST::RawComment::RawComment()
-{
-    NativePtr = new ::CppSharp::CppParser::AST::RawComment();
-}
-
-CppSharp::Parser::AST::RawComment::RawComment(CppSharp::Parser::AST::RawComment^ _0)
-{
-    auto &arg0 = *(::CppSharp::CppParser::AST::RawComment*)_0->NativePtr;
-    NativePtr = new ::CppSharp::CppParser::AST::RawComment(arg0);
-}
-
-System::IntPtr CppSharp::Parser::AST::RawComment::__Instance::get()
-{
-    return System::IntPtr(NativePtr);
-}
-
-void CppSharp::Parser::AST::RawComment::__Instance::set(System::IntPtr object)
-{
-    NativePtr = (::CppSharp::CppParser::AST::RawComment*)object.ToPointer();
-}
-
-System::String^ CppSharp::Parser::AST::RawComment::Text::get()
-{
-    auto __ret = ((::CppSharp::CppParser::AST::RawComment*)NativePtr)->getText();
-    if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
-}
-
-void CppSharp::Parser::AST::RawComment::Text::set(System::String^ value)
-{
-    auto s = value;
-    auto _arg0 = clix::marshalString<clix::E_UTF8>(s);
-    auto arg0 = _arg0.c_str();
-    ((::CppSharp::CppParser::AST::RawComment*)NativePtr)->setText(arg0);
-}
-
-System::String^ CppSharp::Parser::AST::RawComment::BriefText::get()
-{
-    auto __ret = ((::CppSharp::CppParser::AST::RawComment*)NativePtr)->getBriefText();
-    if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
-}
-
-void CppSharp::Parser::AST::RawComment::BriefText::set(System::String^ value)
-{
-    auto s = value;
-    auto _arg0 = clix::marshalString<clix::E_UTF8>(s);
-    auto arg0 = _arg0.c_str();
-    ((::CppSharp::CppParser::AST::RawComment*)NativePtr)->setBriefText(arg0);
-}
-
-CppSharp::Parser::AST::RawCommentKind CppSharp::Parser::AST::RawComment::Kind::get()
-{
-    return (CppSharp::Parser::AST::RawCommentKind)((::CppSharp::CppParser::AST::RawComment*)NativePtr)->Kind;
-}
-
-void CppSharp::Parser::AST::RawComment::Kind::set(CppSharp::Parser::AST::RawCommentKind value)
-{
-    ((::CppSharp::CppParser::AST::RawComment*)NativePtr)->Kind = (::CppSharp::CppParser::AST::RawCommentKind)value;
-}
-
 CppSharp::Parser::AST::VTableComponent::VTableComponent(::CppSharp::CppParser::AST::VTableComponent* native)
 {
     NativePtr = native;
@@ -1622,6 +1550,16 @@ unsigned int CppSharp::Parser::AST::DeclarationContext::VariablesCount::get()
     return __ret;
 }
 
+bool CppSharp::Parser::AST::DeclarationContext::IsAnonymous::get()
+{
+    return ((::CppSharp::CppParser::AST::DeclarationContext*)NativePtr)->IsAnonymous;
+}
+
+void CppSharp::Parser::AST::DeclarationContext::IsAnonymous::set(bool value)
+{
+    ((::CppSharp::CppParser::AST::DeclarationContext*)NativePtr)->IsAnonymous = value;
+}
+
 CppSharp::Parser::AST::TypedefDecl::TypedefDecl(::CppSharp::CppParser::AST::TypedefDecl* native)
     : CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)native)
 {
@@ -2500,12 +2438,12 @@ void CppSharp::Parser::AST::Class::IsExternCContext::set(bool value)
 
 CppSharp::Parser::AST::ClassLayout^ CppSharp::Parser::AST::Class::Layout::get()
 {
-    return gcnew CppSharp::Parser::AST::ClassLayout((::CppSharp::CppParser::AST::ClassLayout*)&((::CppSharp::CppParser::AST::Class*)NativePtr)->Layout);
+    return gcnew CppSharp::Parser::AST::ClassLayout((::CppSharp::CppParser::AST::ClassLayout*)((::CppSharp::CppParser::AST::Class*)NativePtr)->Layout);
 }
 
 void CppSharp::Parser::AST::Class::Layout::set(CppSharp::Parser::AST::ClassLayout^ value)
 {
-    ((::CppSharp::CppParser::AST::Class*)NativePtr)->Layout = *(::CppSharp::CppParser::AST::ClassLayout*)value->NativePtr;
+    ((::CppSharp::CppParser::AST::Class*)NativePtr)->Layout = (::CppSharp::CppParser::AST::ClassLayout*)value->NativePtr;
 }
 
 CppSharp::Parser::AST::Template::Template(::CppSharp::CppParser::AST::Template* native)
@@ -2771,6 +2709,16 @@ CppSharp::Parser::AST::Namespace::Namespace(CppSharp::Parser::AST::Namespace^ _0
     NativePtr = new ::CppSharp::CppParser::AST::Namespace(arg0);
 }
 
+bool CppSharp::Parser::AST::Namespace::IsInline::get()
+{
+    return ((::CppSharp::CppParser::AST::Namespace*)NativePtr)->IsInline;
+}
+
+void CppSharp::Parser::AST::Namespace::IsInline::set(bool value)
+{
+    ((::CppSharp::CppParser::AST::Namespace*)NativePtr)->IsInline = value;
+}
+
 CppSharp::Parser::AST::PreprocessedEntity::PreprocessedEntity(::CppSharp::CppParser::AST::PreprocessedEntity* native)
     : CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)native)
 {
@@ -3087,3 +3035,75 @@ unsigned int CppSharp::Parser::AST::ASTContext::TranslationUnitsCount::get()
     return __ret;
 }
 
+CppSharp::Parser::AST::RawComment::RawComment(::CppSharp::CppParser::AST::RawComment* native)
+{
+    NativePtr = native;
+}
+
+CppSharp::Parser::AST::RawComment::RawComment(System::IntPtr native)
+{
+    auto __native = (::CppSharp::CppParser::AST::RawComment*)native.ToPointer();
+    NativePtr = __native;
+}
+
+CppSharp::Parser::AST::RawComment::RawComment()
+{
+    NativePtr = new ::CppSharp::CppParser::AST::RawComment();
+}
+
+CppSharp::Parser::AST::RawComment::RawComment(CppSharp::Parser::AST::RawComment^ _0)
+{
+    auto &arg0 = *(::CppSharp::CppParser::AST::RawComment*)_0->NativePtr;
+    NativePtr = new ::CppSharp::CppParser::AST::RawComment(arg0);
+}
+
+System::IntPtr CppSharp::Parser::AST::RawComment::__Instance::get()
+{
+    return System::IntPtr(NativePtr);
+}
+
+void CppSharp::Parser::AST::RawComment::__Instance::set(System::IntPtr object)
+{
+    NativePtr = (::CppSharp::CppParser::AST::RawComment*)object.ToPointer();
+}
+
+System::String^ CppSharp::Parser::AST::RawComment::Text::get()
+{
+    auto __ret = ((::CppSharp::CppParser::AST::RawComment*)NativePtr)->getText();
+    if (__ret == nullptr) return nullptr;
+    return clix::marshalString<clix::E_UTF8>(__ret);
+}
+
+void CppSharp::Parser::AST::RawComment::Text::set(System::String^ value)
+{
+    auto s = value;
+    auto _arg0 = clix::marshalString<clix::E_UTF8>(s);
+    auto arg0 = _arg0.c_str();
+    ((::CppSharp::CppParser::AST::RawComment*)NativePtr)->setText(arg0);
+}
+
+System::String^ CppSharp::Parser::AST::RawComment::BriefText::get()
+{
+    auto __ret = ((::CppSharp::CppParser::AST::RawComment*)NativePtr)->getBriefText();
+    if (__ret == nullptr) return nullptr;
+    return clix::marshalString<clix::E_UTF8>(__ret);
+}
+
+void CppSharp::Parser::AST::RawComment::BriefText::set(System::String^ value)
+{
+    auto s = value;
+    auto _arg0 = clix::marshalString<clix::E_UTF8>(s);
+    auto arg0 = _arg0.c_str();
+    ((::CppSharp::CppParser::AST::RawComment*)NativePtr)->setBriefText(arg0);
+}
+
+CppSharp::Parser::AST::RawCommentKind CppSharp::Parser::AST::RawComment::Kind::get()
+{
+    return (CppSharp::Parser::AST::RawCommentKind)((::CppSharp::CppParser::AST::RawComment*)NativePtr)->Kind;
+}
+
+void CppSharp::Parser::AST::RawComment::Kind::set(CppSharp::Parser::AST::RawCommentKind value)
+{
+    ((::CppSharp::CppParser::AST::RawComment*)NativePtr)->Kind = (::CppSharp::CppParser::AST::RawCommentKind)value;
+}
+

src/CppParser/Bindings/CLI/AST.h

@@ -777,42 +777,6 @@ namespace CppSharp
                 }
             };
 
-            public ref class RawComment : ICppInstance
-            {
-            public:
-
-                property ::CppSharp::CppParser::AST::RawComment* NativePtr;
-                property System::IntPtr __Instance
-                {
-                    virtual System::IntPtr get();
-                    virtual void set(System::IntPtr instance);
-                }
-
-                RawComment(::CppSharp::CppParser::AST::RawComment* native);
-                RawComment(System::IntPtr native);
-                RawComment();
-
-                RawComment(CppSharp::Parser::AST::RawComment^ _0);
-
-                property System::String^ Text
-                {
-                    System::String^ get();
-                    void set(System::String^);
-                }
-
-                property System::String^ BriefText
-                {
-                    System::String^ get();
-                    void set(System::String^);
-                }
-
-                property CppSharp::Parser::AST::RawCommentKind Kind
-                {
-                    CppSharp::Parser::AST::RawCommentKind get();
-                    void set(CppSharp::Parser::AST::RawCommentKind);
-                }
-            };
-
             public ref class VTableComponent : ICppInstance
             {
             public:
@@ -1125,6 +1089,12 @@ namespace CppSharp
                     unsigned int get();
                 }
 
+                property bool IsAnonymous
+                {
+                    bool get();
+                    void set(bool);
+                }
+
                 CppSharp::Parser::AST::Namespace^ getNamespaces(unsigned int i);
 
                 void addNamespaces(CppSharp::Parser::AST::Namespace^ s);
@@ -1749,6 +1719,12 @@ namespace CppSharp
                 Namespace();
 
                 Namespace(CppSharp::Parser::AST::Namespace^ _0);
+
+                property bool IsInline
+                {
+                    bool get();
+                    void set(bool);
+                }
             };
 
             public ref class PreprocessedEntity : CppSharp::Parser::AST::Declaration
@@ -1901,6 +1877,42 @@ namespace CppSharp
 
                 void addTranslationUnits(CppSharp::Parser::AST::TranslationUnit^ s);
             };
+
+            public ref class RawComment : ICppInstance
+            {
+            public:
+
+                property ::CppSharp::CppParser::AST::RawComment* NativePtr;
+                property System::IntPtr __Instance
+                {
+                    virtual System::IntPtr get();
+                    virtual void set(System::IntPtr instance);
+                }
+
+                RawComment(::CppSharp::CppParser::AST::RawComment* native);
+                RawComment(System::IntPtr native);
+                RawComment();
+
+                RawComment(CppSharp::Parser::AST::RawComment^ _0);
+
+                property System::String^ Text
+                {
+                    System::String^ get();
+                    void set(System::String^);
+                }
+
+                property System::String^ BriefText
+                {
+                    System::String^ get();
+                    void set(System::String^);
+                }
+
+                property CppSharp::Parser::AST::RawCommentKind Kind
+                {
+                    CppSharp::Parser::AST::RawCommentKind get();
+                    void set(CppSharp::Parser::AST::RawCommentKind);
+                }
+            };
         }
     }
 }

src/CppParser/Bindings/CSharp/CppParser.cs

@@ -90,7 +90,7 @@ namespace CppSharp
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                     EntryPoint="??0ParserOptions@CppParser@CppSharp@@QAE@ABU012@@Z")]
-                internal static extern global::System.IntPtr ctor_2(global::System.IntPtr instance, global::System.IntPtr _0);
+                internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0);
 
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -220,7 +220,7 @@ namespace CppSharp
             {
                 __Instance = Marshal.AllocHGlobal(124);
                 var arg0 = _0 == (CppSharp.Parser.ParserOptions) null ? global::System.IntPtr.Zero : _0.__Instance;
-                Internal.ctor_2(__Instance, arg0);
+                Internal.cctor_2(__Instance, arg0);
             }
 
             public void Dispose()
@@ -519,7 +519,7 @@ namespace CppSharp
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                     EntryPoint="??0ParserDiagnostic@CppParser@CppSharp@@QAE@ABU012@@Z")]
-                internal static extern global::System.IntPtr ctor_2(global::System.IntPtr instance, global::System.IntPtr _0);
+                internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0);
 
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -574,7 +574,7 @@ namespace CppSharp
             {
                 __Instance = Marshal.AllocHGlobal(60);
                 var arg0 = _0 == (CppSharp.Parser.ParserDiagnostic) null ? global::System.IntPtr.Zero : _0.__Instance;
-                Internal.ctor_2(__Instance, arg0);
+                Internal.cctor_2(__Instance, arg0);
             }
 
             public void Dispose()
@@ -694,7 +694,7 @@ namespace CppSharp
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                     EntryPoint="??0ParserResult@CppParser@CppSharp@@QAE@ABU012@@Z")]
-                internal static extern global::System.IntPtr ctor_2(global::System.IntPtr instance, global::System.IntPtr _0);
+                internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0);
 
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -744,7 +744,7 @@ namespace CppSharp
             {
                 __Instance = Marshal.AllocHGlobal(24);
                 var arg0 = _0 == (CppSharp.Parser.ParserResult) null ? global::System.IntPtr.Zero : _0.__Instance;
-                Internal.ctor_2(__Instance, arg0);
+                Internal.cctor_2(__Instance, arg0);
             }
 
             public void Dispose()
@@ -764,7 +764,7 @@ namespace CppSharp
                 var __ret = new CppSharp.Parser.ParserDiagnostic.Internal();
                 Internal.getDiagnostics_0(__Instance, new IntPtr(&__ret), i);
                 var __instance = Marshal.AllocHGlobal(60);
-                CppSharp.Parser.ParserDiagnostic.Internal.ctor_2(__instance, new global::System.IntPtr(&__ret));
+                CppSharp.Parser.ParserDiagnostic.Internal.cctor_2(__instance, new global::System.IntPtr(&__ret));
                 return new CppSharp.Parser.ParserDiagnostic(__instance);
             }
 
@@ -839,7 +839,7 @@ namespace CppSharp
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                     EntryPoint="??0ClangParser@CppParser@CppSharp@@QAE@ABV012@@Z")]
-                internal static extern global::System.IntPtr ctor_1(global::System.IntPtr instance, global::System.IntPtr _0);
+                internal static extern global::System.IntPtr cctor_1(global::System.IntPtr instance, global::System.IntPtr _0);
 
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,

src/CppParser/Bindings/CSharp/Target.cs

@@ -155,7 +155,7 @@ namespace CppSharp
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                     EntryPoint="??0ParserTargetInfo@CppParser@CppSharp@@QAE@ABU012@@Z")]
-                internal static extern global::System.IntPtr ctor_2(global::System.IntPtr instance, global::System.IntPtr _0);
+                internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0);
 
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -200,7 +200,7 @@ namespace CppSharp
             {
                 __Instance = Marshal.AllocHGlobal(176);
                 var arg0 = _0 == (CppSharp.Parser.ParserTargetInfo) null ? global::System.IntPtr.Zero : _0.__Instance;
-                Internal.ctor_2(__Instance, arg0);
+                Internal.cctor_2(__Instance, arg0);
             }
 
             public void Dispose()

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

@@ -35,31 +35,52 @@ namespace CppSharp
             User = 4
         }
 
-        public unsafe partial class ParserOptions : IDisposable, CppSharp.Runtime.ICppMarshal
+        public unsafe partial class ParserOptions : IDisposable
         {
             [StructLayout(LayoutKind.Explicit, Size = 100)]
             public struct Internal
             {
+                [FieldOffset(0)]
+                internal Std.Vector Arguments;
+
+                [FieldOffset(12)]
+                internal Std.String FileName;
+
+                [FieldOffset(24)]
+                internal Std.Vector IncludeDirs;
+
+                [FieldOffset(36)]
+                internal Std.Vector SystemIncludeDirs;
+
+                [FieldOffset(48)]
+                internal Std.Vector Defines;
+
+                [FieldOffset(60)]
+                internal Std.Vector LibraryDirs;
+
                 [FieldOffset(72)]
-                public global::System.IntPtr ASTContext;
+                internal global::System.IntPtr ASTContext;
 
                 [FieldOffset(76)]
-                public int ToolSetToUse;
+                internal int ToolSetToUse;
+
+                [FieldOffset(80)]
+                internal Std.String TargetTriple;
 
                 [FieldOffset(92)]
-                public CppSharp.Parser.AST.CppAbi Abi;
+                internal CppSharp.Parser.AST.CppAbi Abi;
 
                 [FieldOffset(96)]
-                public bool NoStandardIncludes;
+                internal bool NoStandardIncludes;
 
                 [FieldOffset(97)]
-                public bool NoBuiltinIncludes;
+                internal bool NoBuiltinIncludes;
 
                 [FieldOffset(98)]
-                public bool MicrosoftMode;
+                internal bool MicrosoftMode;
 
                 [FieldOffset(99)]
-                public bool Verbose;
+                internal bool Verbose;
 
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -69,7 +90,7 @@ namespace CppSharp
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="_ZN8CppSharp9CppParser13ParserOptionsC2ERKS1_")]
-                internal static extern void ctor_2(global::System.IntPtr instance, global::System.IntPtr _0);
+                internal static extern void cctor_2(global::System.IntPtr instance, global::System.IntPtr _0);
 
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -174,19 +195,6 @@ namespace CppSharp
 
             public global::System.IntPtr __Instance { get; protected set; }
 
-            int CppSharp.Runtime.ICppMarshal.NativeDataSize
-            {
-                get { return 100; }
-            }
-
-            void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-            {
-            }
-
-            void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-            {
-            }
-
             internal ParserOptions(ParserOptions.Internal* native)
                 : this(new global::System.IntPtr(native))
             {
@@ -197,7 +205,7 @@ namespace CppSharp
             {
             }
 
-            public ParserOptions(global::System.IntPtr native)
+            public ParserOptions(global::System.IntPtr native, bool isInternalImpl = false)
             {
                 __Instance = native;
             }
@@ -208,6 +216,13 @@ namespace CppSharp
                 Internal.ctor_0(__Instance);
             }
 
+            public ParserOptions(CppSharp.Parser.ParserOptions _0)
+            {
+                __Instance = Marshal.AllocHGlobal(100);
+                var arg0 = _0 == (CppSharp.Parser.ParserOptions) null ? global::System.IntPtr.Zero : _0.__Instance;
+                Internal.cctor_2(__Instance, arg0);
+            }
+
             public void Dispose()
             {
                 Dispose(disposing: true);
@@ -476,19 +491,25 @@ namespace CppSharp
             }
         }
 
-        public unsafe partial class ParserDiagnostic : IDisposable, CppSharp.Runtime.ICppMarshal
+        public unsafe partial class ParserDiagnostic : IDisposable
         {
             [StructLayout(LayoutKind.Explicit, Size = 36)]
             public struct Internal
             {
+                [FieldOffset(0)]
+                internal Std.String FileName;
+
+                [FieldOffset(12)]
+                internal Std.String Message;
+
                 [FieldOffset(24)]
-                public CppSharp.Parser.ParserDiagnosticLevel Level;
+                internal CppSharp.Parser.ParserDiagnosticLevel Level;
 
                 [FieldOffset(28)]
-                public int LineNumber;
+                internal int LineNumber;
 
                 [FieldOffset(32)]
-                public int ColumnNumber;
+                internal int ColumnNumber;
 
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -498,7 +519,7 @@ namespace CppSharp
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="_ZN8CppSharp9CppParser16ParserDiagnosticC2ERKS1_")]
-                internal static extern void ctor_2(global::System.IntPtr instance, global::System.IntPtr _0);
+                internal static extern void cctor_2(global::System.IntPtr instance, global::System.IntPtr _0);
 
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -528,19 +549,6 @@ namespace CppSharp
 
             public global::System.IntPtr __Instance { get; protected set; }
 
-            int CppSharp.Runtime.ICppMarshal.NativeDataSize
-            {
-                get { return 36; }
-            }
-
-            void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-            {
-            }
-
-            void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-            {
-            }
-
             internal ParserDiagnostic(ParserDiagnostic.Internal* native)
                 : this(new global::System.IntPtr(native))
             {
@@ -551,7 +559,7 @@ namespace CppSharp
             {
             }
 
-            public ParserDiagnostic(global::System.IntPtr native)
+            public ParserDiagnostic(global::System.IntPtr native, bool isInternalImpl = false)
             {
                 __Instance = native;
             }
@@ -562,6 +570,13 @@ namespace CppSharp
                 Internal.ctor_1(__Instance);
             }
 
+            public ParserDiagnostic(CppSharp.Parser.ParserDiagnostic _0)
+            {
+                __Instance = Marshal.AllocHGlobal(36);
+                var arg0 = _0 == (CppSharp.Parser.ParserDiagnostic) null ? global::System.IntPtr.Zero : _0.__Instance;
+                Internal.cctor_2(__Instance, arg0);
+            }
+
             public void Dispose()
             {
                 Dispose(disposing: true);
@@ -654,19 +669,22 @@ namespace CppSharp
             }
         }
 
-        public unsafe partial class ParserResult : IDisposable, CppSharp.Runtime.ICppMarshal
+        public unsafe partial class ParserResult : IDisposable
         {
             [StructLayout(LayoutKind.Explicit, Size = 24)]
             public struct Internal
             {
                 [FieldOffset(0)]
-                public CppSharp.Parser.ParserResultKind Kind;
+                internal CppSharp.Parser.ParserResultKind Kind;
+
+                [FieldOffset(4)]
+                internal Std.Vector Diagnostics;
 
                 [FieldOffset(16)]
-                public global::System.IntPtr ASTContext;
+                internal global::System.IntPtr ASTContext;
 
                 [FieldOffset(20)]
-                public global::System.IntPtr Library;
+                internal global::System.IntPtr Library;
 
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -676,7 +694,7 @@ namespace CppSharp
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="_ZN8CppSharp9CppParser12ParserResultC2ERKS1_")]
-                internal static extern void ctor_2(global::System.IntPtr instance, global::System.IntPtr _0);
+                internal static extern void cctor_2(global::System.IntPtr instance, global::System.IntPtr _0);
 
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -686,7 +704,7 @@ namespace CppSharp
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="_ZN8CppSharp9CppParser12ParserResult14getDiagnosticsEj")]
-                internal static extern void getDiagnostics_0(global::System.IntPtr __return, global::System.IntPtr instance, uint i);
+                internal static extern void getDiagnostics_0(global::System.IntPtr instance, global::System.IntPtr @return, uint i);
 
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -701,19 +719,6 @@ namespace CppSharp
 
             public global::System.IntPtr __Instance { get; protected set; }
 
-            int CppSharp.Runtime.ICppMarshal.NativeDataSize
-            {
-                get { return 24; }
-            }
-
-            void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-            {
-            }
-
-            void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-            {
-            }
-
             internal ParserResult(ParserResult.Internal* native)
                 : this(new global::System.IntPtr(native))
             {
@@ -724,7 +729,7 @@ namespace CppSharp
             {
             }
 
-            public ParserResult(global::System.IntPtr native)
+            public ParserResult(global::System.IntPtr native, bool isInternalImpl = false)
             {
                 __Instance = native;
             }
@@ -735,6 +740,13 @@ namespace CppSharp
                 Internal.ctor_0(__Instance);
             }
 
+            public ParserResult(CppSharp.Parser.ParserResult _0)
+            {
+                __Instance = Marshal.AllocHGlobal(24);
+                var arg0 = _0 == (CppSharp.Parser.ParserResult) null ? global::System.IntPtr.Zero : _0.__Instance;
+                Internal.cctor_2(__Instance, arg0);
+            }
+
             public void Dispose()
             {
                 Dispose(disposing: true);
@@ -752,7 +764,7 @@ namespace CppSharp
                 var __ret = new CppSharp.Parser.ParserDiagnostic.Internal();
                 Internal.getDiagnostics_0(__Instance, new IntPtr(&__ret), i);
                 var __instance = Marshal.AllocHGlobal(36);
-                CppSharp.Parser.ParserDiagnostic.Internal.ctor_2(__instance, new global::System.IntPtr(&__ret));
+                CppSharp.Parser.ParserDiagnostic.Internal.cctor_2(__instance, new global::System.IntPtr(&__ret));
                 return new CppSharp.Parser.ParserDiagnostic(__instance);
             }
 
@@ -819,7 +831,7 @@ namespace CppSharp
             }
         }
 
-        public unsafe partial class ClangParser : IDisposable, CppSharp.Runtime.ICppMarshal
+        public unsafe partial class ClangParser : IDisposable
         {
             [StructLayout(LayoutKind.Explicit, Size = 1)]
             public struct Internal
@@ -827,7 +839,7 @@ namespace CppSharp
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="_ZN8CppSharp9CppParser11ClangParserC2ERKS1_")]
-                internal static extern void ctor_1(global::System.IntPtr instance, global::System.IntPtr _0);
+                internal static extern void cctor_1(global::System.IntPtr instance, global::System.IntPtr _0);
 
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -838,22 +850,14 @@ namespace CppSharp
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="_ZN8CppSharp9CppParser11ClangParser12ParseLibraryEPNS0_13ParserOptionsE")]
                 internal static extern global::System.IntPtr ParseLibrary_0(global::System.IntPtr Opts);
-            }
-
-            public global::System.IntPtr __Instance { get; protected set; }
 
-            int CppSharp.Runtime.ICppMarshal.NativeDataSize
-            {
-                get { return 1; }
-            }
-
-            void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
-            {
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                    EntryPoint="_ZN8CppSharp9CppParser11ClangParser13GetTargetInfoEPNS0_13ParserOptionsE")]
+                internal static extern global::System.IntPtr GetTargetInfo_0(global::System.IntPtr Opts);
             }
 
-            void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
-            {
-            }
+            public global::System.IntPtr __Instance { get; protected set; }
 
             internal ClangParser(ClangParser.Internal* native)
                 : this(new global::System.IntPtr(native))
@@ -865,7 +869,7 @@ namespace CppSharp
             {
             }
 
-            public ClangParser(global::System.IntPtr native)
+            public ClangParser(global::System.IntPtr native, bool isInternalImpl = false)
             {
                 __Instance = native;
             }
@@ -875,6 +879,12 @@ namespace CppSharp
                 __Instance = Marshal.AllocHGlobal(1);
             }
 
+            public ClangParser(CppSharp.Parser.ClangParser _0)
+            {
+                __Instance = Marshal.AllocHGlobal(1);
+                *((ClangParser.Internal*) __Instance) = *((ClangParser.Internal*) _0.__Instance);
+            }
+
             public void Dispose()
             {
                 Dispose(disposing: true);
@@ -901,6 +911,14 @@ namespace CppSharp
                 if (__ret == global::System.IntPtr.Zero) return null;
                 return new CppSharp.Parser.ParserResult(__ret);
             }
+
+            public static CppSharp.Parser.ParserTargetInfo GetTargetInfo(CppSharp.Parser.ParserOptions Opts)
+            {
+                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 new CppSharp.Parser.ParserTargetInfo(__ret);
+            }
         }
     }
 }