Re-generated the CLI and C# bindings to the new parser.

src/CppParser/Bindings/CLI/CppParser.cpp

@@ -128,14 +128,14 @@ void CppSharp::Parser::ParserOptions::FileName::set(System::String^ value)
     ((::CppSharp::CppParser::ParserOptions*)NativePtr)->FileName = clix::marshalString<clix::E_UTF8>(value);
 }
 
-CppSharp::Parser::Library^ CppSharp::Parser::ParserOptions::Library::get()
+CppSharp::Parser::AST::Library^ CppSharp::Parser::ParserOptions::Library::get()
 {
-    return gcnew CppSharp::Parser::Library((::CppSharp::CppParser::Library*)((::CppSharp::CppParser::ParserOptions*)NativePtr)->Library);
+    return gcnew CppSharp::Parser::AST::Library((::CppSharp::CppParser::AST::Library*)((::CppSharp::CppParser::ParserOptions*)NativePtr)->Library);
 }
 
-void CppSharp::Parser::ParserOptions::Library::set(CppSharp::Parser::Library^ value)
+void CppSharp::Parser::ParserOptions::Library::set(CppSharp::Parser::AST::Library^ value)
 {
-    ((::CppSharp::CppParser::ParserOptions*)NativePtr)->Library = (::CppSharp::CppParser::Library*)value->NativePtr;
+    ((::CppSharp::CppParser::ParserOptions*)NativePtr)->Library = (::CppSharp::CppParser::AST::Library*)value->NativePtr;
 }
 
 int CppSharp::Parser::ParserOptions::ToolSetToUse::get()
@@ -188,14 +188,14 @@ void CppSharp::Parser::ParserOptions::MicrosoftMode::set(bool value)
     ((::CppSharp::CppParser::ParserOptions*)NativePtr)->MicrosoftMode = value;
 }
 
-CppSharp::Parser::CppAbi CppSharp::Parser::ParserOptions::Abi::get()
+CppSharp::Parser::AST::CppAbi CppSharp::Parser::ParserOptions::Abi::get()
 {
-    return (CppSharp::Parser::CppAbi)((::CppSharp::CppParser::ParserOptions*)NativePtr)->Abi;
+    return (CppSharp::Parser::AST::CppAbi)((::CppSharp::CppParser::ParserOptions*)NativePtr)->Abi;
 }
 
-void CppSharp::Parser::ParserOptions::Abi::set(CppSharp::Parser::CppAbi value)
+void CppSharp::Parser::ParserOptions::Abi::set(CppSharp::Parser::AST::CppAbi value)
 {
-    ((::CppSharp::CppParser::ParserOptions*)NativePtr)->Abi = (::CppSharp::CppParser::CppAbi)value;
+    ((::CppSharp::CppParser::ParserOptions*)NativePtr)->Abi = (::CppSharp::CppParser::AST::CppAbi)value;
 }
 
 bool CppSharp::Parser::ParserOptions::Verbose::get()
@@ -320,14 +320,14 @@ void CppSharp::Parser::ParserResult::Kind::set(CppSharp::Parser::ParserResultKin
     ((::CppSharp::CppParser::ParserResult*)NativePtr)->Kind = (::CppSharp::CppParser::ParserResultKind)value;
 }
 
-CppSharp::Parser::Library^ CppSharp::Parser::ParserResult::Library::get()
+CppSharp::Parser::AST::Library^ CppSharp::Parser::ParserResult::Library::get()
 {
-    return gcnew CppSharp::Parser::Library((::CppSharp::CppParser::Library*)((::CppSharp::CppParser::ParserResult*)NativePtr)->Library);
+    return gcnew CppSharp::Parser::AST::Library((::CppSharp::CppParser::AST::Library*)((::CppSharp::CppParser::ParserResult*)NativePtr)->Library);
 }
 
-void CppSharp::Parser::ParserResult::Library::set(CppSharp::Parser::Library^ value)
+void CppSharp::Parser::ParserResult::Library::set(CppSharp::Parser::AST::Library^ value)
 {
-    ((::CppSharp::CppParser::ParserResult*)NativePtr)->Library = (::CppSharp::CppParser::Library*)value->NativePtr;
+    ((::CppSharp::CppParser::ParserResult*)NativePtr)->Library = (::CppSharp::CppParser::AST::Library*)value->NativePtr;
 }
 
 System::Collections::Generic::List<CppSharp::Parser::ParserDiagnostic^>^ CppSharp::Parser::ParserResult::Diagnostics::get()

src/CppParser/Bindings/CLI/CppParser.h

@@ -5,27 +5,27 @@
 
 namespace CppSharp
 {
-    enum struct CppAbi;
-    enum struct ParserDiagnosticLevel;
-    enum struct ParserResultKind;
-    enum struct SourceLocationKind;
-    ref class ClangParser;
-    ref class Library;
-    ref class ParserDiagnostic;
-    ref class ParserOptions;
-    ref class ParserResult;
-
     namespace Parser
     {
-        enum struct CppAbi;
+        ref class ParserOptions;
+        ref class ParserDiagnostic;
         enum struct ParserDiagnosticLevel;
+        ref class ParserResult;
         enum struct ParserResultKind;
         ref class ClangParser;
-        ref class Library;
+        enum struct SourceLocationKind;
-        ref class ParserDiagnostic;
+        namespace AST
-        ref class ParserOptions;
+        {
-        ref class ParserResult;
+            ref class Library;
+            enum struct CppAbi;
+        }
+    }
+}
 
+namespace CppSharp
+{
+    namespace Parser
+    {
         public enum struct ParserDiagnosticLevel
         {
             Ignored = 0,
@@ -91,10 +91,10 @@ namespace CppSharp
                 System::String^ get();
                 void set(System::String^);
             }
-            property CppSharp::Parser::Library^ Library
+            property CppSharp::Parser::AST::Library^ Library
             {
-                CppSharp::Parser::Library^ get();
+                CppSharp::Parser::AST::Library^ get();
-                void set(CppSharp::Parser::Library^);
+                void set(CppSharp::Parser::AST::Library^);
             }
             property int ToolSetToUse
             {
@@ -121,10 +121,10 @@ namespace CppSharp
                 bool get();
                 void set(bool);
             }
-            property CppSharp::Parser::CppAbi Abi
+            property CppSharp::Parser::AST::CppAbi Abi
             {
-                CppSharp::Parser::CppAbi get();
+                CppSharp::Parser::AST::CppAbi get();
-                void set(CppSharp::Parser::CppAbi);
+                void set(CppSharp::Parser::AST::CppAbi);
             }
             property bool Verbose
             {
@@ -195,10 +195,10 @@ namespace CppSharp
                 CppSharp::Parser::ParserResultKind get();
                 void set(CppSharp::Parser::ParserResultKind);
             }
-            property CppSharp::Parser::Library^ Library
+            property CppSharp::Parser::AST::Library^ Library
             {
-                CppSharp::Parser::Library^ get();
+                CppSharp::Parser::AST::Library^ get();
-                void set(CppSharp::Parser::Library^);
+                void set(CppSharp::Parser::AST::Library^);
             }
             property System::Collections::Generic::List<CppSharp::Parser::ParserDiagnostic^>^ Diagnostics
             {

src/CppParser/Bindings/CSharp/CppParser.cs

@@ -2,7 +2,6 @@
 // This is autogenerated code by CppSharp.
 // Do not edit this file or all your changes will be lost after re-generation.
 //----------------------------------------------------------------------------
-using CppSharp.Runtime;
 using System;
 using System.Runtime.InteropServices;
 using System.Security;
@@ -36,7 +35,7 @@ namespace CppSharp
             User = 4
         }
 
-        public unsafe partial class ParserOptions : IDisposable, ICppMarshal
+        public unsafe partial class ParserOptions : IDisposable, CppSharp.Runtime.ICppMarshal
         {
             [StructLayout(LayoutKind.Explicit, Size = 116)]
             public struct Internal
@@ -75,7 +74,7 @@ namespace CppSharp
                 public bool MicrosoftMode;
 
                 [FieldOffset(108)]
-                public CppSharp.Parser.CppAbi Abi;
+                public CppSharp.Parser.AST.CppAbi Abi;
 
                 [FieldOffset(112)]
                 public bool Verbose;
@@ -93,11 +92,11 @@ namespace CppSharp
 
             public global::System.IntPtr __Instance { get; protected set; }
 
-            void ICppMarshal.MarshalManagedToNative(IntPtr instance)
+            void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
             {
             }
 
-            void ICppMarshal.MarshalNativeToManaged(IntPtr instance)
+            void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
             {
             }
 
@@ -208,13 +207,13 @@ namespace CppSharp
                 }
             }
 
-            public CppSharp.Parser.Library Library
+            public CppSharp.Parser.AST.Library Library
             {
                 get
                 {
                     var __ptr = (Internal*)__Instance.ToPointer();
                     var __copy = new global::System.IntPtr(&__ptr->Library);
-                    return new CppSharp.Parser.Library(__copy);
+                    return new CppSharp.Parser.AST.Library(__copy);
                 }
 
                 set
@@ -299,7 +298,7 @@ namespace CppSharp
                 }
             }
 
-            public CppSharp.Parser.CppAbi Abi
+            public CppSharp.Parser.AST.CppAbi Abi
             {
                 get
                 {
@@ -330,7 +329,7 @@ namespace CppSharp
             }
         }
 
-        public unsafe partial class ParserDiagnostic : IDisposable, ICppMarshal
+        public unsafe partial class ParserDiagnostic : IDisposable, CppSharp.Runtime.ICppMarshal
         {
             [StructLayout(LayoutKind.Explicit, Size = 60)]
             public struct Internal
@@ -363,11 +362,11 @@ namespace CppSharp
 
             public global::System.IntPtr __Instance { get; protected set; }
 
-            void ICppMarshal.MarshalManagedToNative(IntPtr instance)
+            void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
             {
             }
 
-            void ICppMarshal.MarshalNativeToManaged(IntPtr instance)
+            void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
             {
             }
 
@@ -479,7 +478,7 @@ namespace CppSharp
             }
         }
 
-        public unsafe partial class ParserResult : IDisposable, ICppMarshal
+        public unsafe partial class ParserResult : IDisposable, CppSharp.Runtime.ICppMarshal
         {
             [StructLayout(LayoutKind.Explicit, Size = 20)]
             public struct Internal
@@ -506,11 +505,11 @@ namespace CppSharp
 
             public global::System.IntPtr __Instance { get; protected set; }
 
-            void ICppMarshal.MarshalManagedToNative(IntPtr instance)
+            void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
             {
             }
 
-            void ICppMarshal.MarshalNativeToManaged(IntPtr instance)
+            void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
             {
             }
 
@@ -561,13 +560,13 @@ namespace CppSharp
                 }
             }
 
-            public CppSharp.Parser.Library Library
+            public CppSharp.Parser.AST.Library Library
             {
                 get
                 {
                     var __ptr = (Internal*)__Instance.ToPointer();
                     var __copy = new global::System.IntPtr(&__ptr->Library);
-                    return new CppSharp.Parser.Library(__copy);
+                    return new CppSharp.Parser.AST.Library(__copy);
                 }
 
                 set
@@ -593,7 +592,7 @@ namespace CppSharp
             }
         }
 
-        public unsafe partial class ClangParser : IDisposable, ICppMarshal
+        public unsafe partial class ClangParser : IDisposable, CppSharp.Runtime.ICppMarshal
         {
             [StructLayout(LayoutKind.Explicit, Size = 1)]
             public struct Internal
@@ -616,11 +615,11 @@ namespace CppSharp
 
             public global::System.IntPtr __Instance { get; protected set; }
 
-            void ICppMarshal.MarshalManagedToNative(IntPtr instance)
+            void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)
             {
             }
 
-            void ICppMarshal.MarshalNativeToManaged(IntPtr instance)
+            void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)
             {
             }