Re-generated the parser bindings.

src/CppParser/Bindings/CLI/AST.cpp

@@ -14,9 +14,10 @@ CppSharp::Parser::AST::Type::Type(System::IntPtr native)
     NativePtr = __native;
 }
 
-CppSharp::Parser::AST::Type::Type()
+CppSharp::Parser::AST::Type::Type(CppSharp::Parser::AST::TypeKind kind)
 {
-    NativePtr = new ::CppSharp::CppParser::AST::Type();
+    auto arg0 = (::CppSharp::CppParser::AST::TypeKind)kind;
+    NativePtr = new ::CppSharp::CppParser::AST::Type(arg0);
 }
 
 System::IntPtr CppSharp::Parser::AST::Type::Instance::get()
@@ -29,6 +30,16 @@ void CppSharp::Parser::AST::Type::Instance::set(System::IntPtr object)
     NativePtr = (::CppSharp::CppParser::AST::Type*)object.ToPointer();
 }
 
+CppSharp::Parser::AST::TypeKind CppSharp::Parser::AST::Type::Kind::get()
+{
+    return (CppSharp::Parser::AST::TypeKind)((::CppSharp::CppParser::AST::Type*)NativePtr)->Kind;
+}
+
+void CppSharp::Parser::AST::Type::Kind::set(CppSharp::Parser::AST::TypeKind value)
+{
+    ((::CppSharp::CppParser::AST::Type*)NativePtr)->Kind = (::CppSharp::CppParser::AST::TypeKind)value;
+}
+
 bool CppSharp::Parser::AST::Type::IsDependent::get()
 {
     return ((::CppSharp::CppParser::AST::Type*)NativePtr)->IsDependent;
@@ -226,6 +237,12 @@ CppSharp::Parser::AST::FunctionType::FunctionType(System::IntPtr native)
     auto __native = (::CppSharp::CppParser::AST::FunctionType*)native.ToPointer();
 }
 
+CppSharp::Parser::AST::FunctionType::FunctionType()
+    : CppSharp::Parser::AST::Type((::CppSharp::CppParser::AST::Type*)nullptr)
+{
+    NativePtr = new ::CppSharp::CppParser::AST::FunctionType();
+}
+
 CppSharp::Parser::AST::Parameter^ CppSharp::Parser::AST::FunctionType::getParameters(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::AST::FunctionType*)NativePtr)->getParameters(i);
@@ -233,12 +250,6 @@ CppSharp::Parser::AST::Parameter^ CppSharp::Parser::AST::FunctionType::getParame
     return gcnew CppSharp::Parser::AST::Parameter((::CppSharp::CppParser::AST::Parameter*)__ret);
 }
 
-CppSharp::Parser::AST::FunctionType::FunctionType()
-    : CppSharp::Parser::AST::Type((::CppSharp::CppParser::AST::Type*)nullptr)
-{
-    NativePtr = new ::CppSharp::CppParser::AST::FunctionType();
-}
-
 unsigned int CppSharp::Parser::AST::FunctionType::ParametersCount::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::FunctionType*)NativePtr)->getParametersCount();
@@ -517,6 +528,12 @@ CppSharp::Parser::AST::TemplateSpecializationType::TemplateSpecializationType(Sy
     auto __native = (::CppSharp::CppParser::AST::TemplateSpecializationType*)native.ToPointer();
 }
 
+CppSharp::Parser::AST::TemplateSpecializationType::TemplateSpecializationType()
+    : CppSharp::Parser::AST::Type((::CppSharp::CppParser::AST::Type*)nullptr)
+{
+    NativePtr = new ::CppSharp::CppParser::AST::TemplateSpecializationType();
+}
+
 CppSharp::Parser::AST::TemplateArgument^ CppSharp::Parser::AST::TemplateSpecializationType::getArguments(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::AST::TemplateSpecializationType*)NativePtr)->getArguments(i);
@@ -524,12 +541,6 @@ CppSharp::Parser::AST::TemplateArgument^ CppSharp::Parser::AST::TemplateSpeciali
     return gcnew CppSharp::Parser::AST::TemplateArgument((::CppSharp::CppParser::AST::TemplateArgument*)____ret);
 }
 
-CppSharp::Parser::AST::TemplateSpecializationType::TemplateSpecializationType()
-    : CppSharp::Parser::AST::Type((::CppSharp::CppParser::AST::Type*)nullptr)
-{
-    NativePtr = new ::CppSharp::CppParser::AST::TemplateSpecializationType();
-}
-
 unsigned int CppSharp::Parser::AST::TemplateSpecializationType::ArgumentsCount::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::TemplateSpecializationType*)NativePtr)->getArgumentsCount();
@@ -1087,9 +1098,10 @@ CppSharp::Parser::AST::Declaration::Declaration(System::IntPtr native)
     NativePtr = __native;
 }
 
-CppSharp::Parser::AST::Declaration::Declaration()
+CppSharp::Parser::AST::Declaration::Declaration(CppSharp::Parser::AST::DeclarationKind kind)
 {
-    NativePtr = new ::CppSharp::CppParser::AST::Declaration();
+    auto arg0 = (::CppSharp::CppParser::AST::DeclarationKind)kind;
+    NativePtr = new ::CppSharp::CppParser::AST::Declaration(arg0);
 }
 
 CppSharp::Parser::AST::PreprocessedEntity^ CppSharp::Parser::AST::Declaration::getPreprocessedEntities(unsigned int i)
@@ -1145,6 +1157,16 @@ unsigned int CppSharp::Parser::AST::Declaration::PreprocessedEntitiesCount::get(
     return __ret;
 }
 
+CppSharp::Parser::AST::DeclarationKind CppSharp::Parser::AST::Declaration::Kind::get()
+{
+    return (CppSharp::Parser::AST::DeclarationKind)((::CppSharp::CppParser::AST::Declaration*)NativePtr)->Kind;
+}
+
+void CppSharp::Parser::AST::Declaration::Kind::set(CppSharp::Parser::AST::DeclarationKind value)
+{
+    ((::CppSharp::CppParser::AST::Declaration*)NativePtr)->Kind = (::CppSharp::CppParser::AST::DeclarationKind)value;
+}
+
 CppSharp::Parser::AST::AccessSpecifier CppSharp::Parser::AST::Declaration::Access::get()
 {
     return (CppSharp::Parser::AST::AccessSpecifier)((::CppSharp::CppParser::AST::Declaration*)NativePtr)->Access;
@@ -1236,6 +1258,12 @@ CppSharp::Parser::AST::DeclarationContext::DeclarationContext(System::IntPtr nat
     auto __native = (::CppSharp::CppParser::AST::DeclarationContext*)native.ToPointer();
 }
 
+CppSharp::Parser::AST::DeclarationContext::DeclarationContext()
+    : CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)nullptr)
+{
+    NativePtr = new ::CppSharp::CppParser::AST::DeclarationContext();
+}
+
 CppSharp::Parser::AST::Declaration^ CppSharp::Parser::AST::DeclarationContext::FindAnonymous(unsigned long long key)
 {
     auto arg0 = (::uint64_t)key;
@@ -1394,12 +1422,6 @@ CppSharp::Parser::AST::Variable^ CppSharp::Parser::AST::DeclarationContext::getV
     return gcnew CppSharp::Parser::AST::Variable((::CppSharp::CppParser::AST::Variable*)__ret);
 }
 
-CppSharp::Parser::AST::DeclarationContext::DeclarationContext()
-    : CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)nullptr)
-{
-    NativePtr = new ::CppSharp::CppParser::AST::DeclarationContext();
-}
-
 unsigned int CppSharp::Parser::AST::DeclarationContext::NamespacesCount::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::DeclarationContext*)NativePtr)->getNamespacesCount();
@@ -1733,14 +1755,14 @@ void CppSharp::Parser::AST::Method::IsOverride::set(bool value)
     ((::CppSharp::CppParser::AST::Method*)NativePtr)->IsOverride = value;
 }
 
-CppSharp::Parser::AST::CXXMethodKind CppSharp::Parser::AST::Method::Kind::get()
+CppSharp::Parser::AST::CXXMethodKind CppSharp::Parser::AST::Method::MethodKind::get()
 {
-    return (CppSharp::Parser::AST::CXXMethodKind)((::CppSharp::CppParser::AST::Method*)NativePtr)->Kind;
+    return (CppSharp::Parser::AST::CXXMethodKind)((::CppSharp::CppParser::AST::Method*)NativePtr)->MethodKind;
 }
 
-void CppSharp::Parser::AST::Method::Kind::set(CppSharp::Parser::AST::CXXMethodKind value)
+void CppSharp::Parser::AST::Method::MethodKind::set(CppSharp::Parser::AST::CXXMethodKind value)
 {
-    ((::CppSharp::CppParser::AST::Method*)NativePtr)->Kind = (::CppSharp::CppParser::AST::CXXMethodKind)value;
+    ((::CppSharp::CppParser::AST::Method*)NativePtr)->MethodKind = (::CppSharp::CppParser::AST::CXXMethodKind)value;
 }
 
 bool CppSharp::Parser::AST::Method::IsDefaultConstructor::get()
@@ -1836,6 +1858,12 @@ CppSharp::Parser::AST::Enumeration::Enumeration(System::IntPtr native)
     auto __native = (::CppSharp::CppParser::AST::Enumeration*)native.ToPointer();
 }
 
+CppSharp::Parser::AST::Enumeration::Enumeration()
+    : CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)nullptr)
+{
+    NativePtr = new ::CppSharp::CppParser::AST::Enumeration();
+}
+
 CppSharp::Parser::AST::Enumeration::Item^ CppSharp::Parser::AST::Enumeration::getItems(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::AST::Enumeration*)NativePtr)->getItems(i);
@@ -1843,12 +1871,6 @@ CppSharp::Parser::AST::Enumeration::Item^ CppSharp::Parser::AST::Enumeration::ge
     return gcnew CppSharp::Parser::AST::Enumeration::Item((::CppSharp::CppParser::AST::Enumeration::Item*)____ret);
 }
 
-CppSharp::Parser::AST::Enumeration::Enumeration()
-    : CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)nullptr)
-{
-    NativePtr = new ::CppSharp::CppParser::AST::Enumeration();
-}
-
 unsigned int CppSharp::Parser::AST::Enumeration::ItemsCount::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::Enumeration*)NativePtr)->getItemsCount();
@@ -2068,6 +2090,12 @@ CppSharp::Parser::AST::Class::Class(System::IntPtr native)
     auto __native = (::CppSharp::CppParser::AST::Class*)native.ToPointer();
 }
 
+CppSharp::Parser::AST::Class::Class()
+    : CppSharp::Parser::AST::DeclarationContext((::CppSharp::CppParser::AST::DeclarationContext*)nullptr)
+{
+    NativePtr = new ::CppSharp::CppParser::AST::Class();
+}
+
 CppSharp::Parser::AST::BaseClassSpecifier^ CppSharp::Parser::AST::Class::getBases(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::AST::Class*)NativePtr)->getBases(i);
@@ -2096,12 +2124,6 @@ CppSharp::Parser::AST::AccessSpecifierDecl^ CppSharp::Parser::AST::Class::getSpe
     return gcnew CppSharp::Parser::AST::AccessSpecifierDecl((::CppSharp::CppParser::AST::AccessSpecifierDecl*)__ret);
 }
 
-CppSharp::Parser::AST::Class::Class()
-    : CppSharp::Parser::AST::DeclarationContext((::CppSharp::CppParser::AST::DeclarationContext*)nullptr)
-{
-    NativePtr = new ::CppSharp::CppParser::AST::Class();
-}
-
 unsigned int CppSharp::Parser::AST::Class::BasesCount::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::Class*)NativePtr)->getBasesCount();
@@ -2227,6 +2249,12 @@ CppSharp::Parser::AST::Template::Template(System::IntPtr native)
     auto __native = (::CppSharp::CppParser::AST::Template*)native.ToPointer();
 }
 
+CppSharp::Parser::AST::Template::Template()
+    : CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)nullptr)
+{
+    NativePtr = new ::CppSharp::CppParser::AST::Template();
+}
+
 CppSharp::Parser::AST::TemplateParameter^ CppSharp::Parser::AST::Template::getParameters(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::AST::Template*)NativePtr)->getParameters(i);
@@ -2234,12 +2262,6 @@ CppSharp::Parser::AST::TemplateParameter^ CppSharp::Parser::AST::Template::getPa
     return gcnew CppSharp::Parser::AST::TemplateParameter((::CppSharp::CppParser::AST::TemplateParameter*)____ret);
 }
 
-CppSharp::Parser::AST::Template::Template()
-    : CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)nullptr)
-{
-    NativePtr = new ::CppSharp::CppParser::AST::Template();
-}
-
 unsigned int CppSharp::Parser::AST::Template::ParametersCount::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::Template*)NativePtr)->getParametersCount();
@@ -2453,6 +2475,12 @@ CppSharp::Parser::AST::TranslationUnit::TranslationUnit(System::IntPtr native)
     auto __native = (::CppSharp::CppParser::AST::TranslationUnit*)native.ToPointer();
 }
 
+CppSharp::Parser::AST::TranslationUnit::TranslationUnit()
+    : CppSharp::Parser::AST::Namespace((::CppSharp::CppParser::AST::Namespace*)nullptr)
+{
+    NativePtr = new ::CppSharp::CppParser::AST::TranslationUnit();
+}
+
 CppSharp::Parser::AST::MacroDefinition^ CppSharp::Parser::AST::TranslationUnit::getMacros(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::AST::TranslationUnit*)NativePtr)->getMacros(i);
@@ -2460,12 +2488,6 @@ CppSharp::Parser::AST::MacroDefinition^ CppSharp::Parser::AST::TranslationUnit::
     return gcnew CppSharp::Parser::AST::MacroDefinition((::CppSharp::CppParser::AST::MacroDefinition*)__ret);
 }
 
-CppSharp::Parser::AST::TranslationUnit::TranslationUnit()
-    : CppSharp::Parser::AST::Namespace((::CppSharp::CppParser::AST::Namespace*)nullptr)
-{
-    NativePtr = new ::CppSharp::CppParser::AST::TranslationUnit();
-}
-
 System::String^ CppSharp::Parser::AST::TranslationUnit::FileName::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::TranslationUnit*)NativePtr)->getFileName();

src/CppParser/Bindings/CLI/AST.h

@@ -14,9 +14,11 @@ namespace CppSharp
             enum struct CXXOperatorKind;
             enum struct CallingConvention;
             enum struct CppAbi;
+            enum struct DeclarationKind;
             enum struct MacroLocation;
             enum struct PrimitiveType;
             enum struct RawCommentKind;
+            enum struct TypeKind;
             enum struct VTableComponentKind;
             ref class ASTContext;
             ref class AccessSpecifierDecl;
@@ -76,6 +78,48 @@ namespace CppSharp
     {
         namespace AST
         {
+            public enum struct TypeKind
+            {
+                Tag = 0,
+                Array = 1,
+                Function = 2,
+                Pointer = 3,
+                MemberPointer = 4,
+                Typedef = 5,
+                Attributed = 6,
+                Decayed = 7,
+                TemplateSpecialization = 8,
+                TemplateParameter = 9,
+                TemplateParameterSubstitution = 10,
+                InjectedClassName = 11,
+                DependentName = 12,
+                Builtin = 13
+            };
+
+            public enum struct DeclarationKind
+            {
+                DeclarationContext = 0,
+                Typedef = 1,
+                Parameter = 2,
+                Function = 3,
+                Method = 4,
+                Enumeration = 5,
+                Variable = 6,
+                Field = 7,
+                AccessSpecifier = 8,
+                Class = 9,
+                Template = 10,
+                ClassTemplate = 11,
+                ClassTemplateSpecialization = 12,
+                ClassTemplatePartialSpecialization = 13,
+                FunctionTemplate = 14,
+                Namespace = 15,
+                PreprocessedEntity = 16,
+                MacroDefinition = 17,
+                MacroExpansion = 18,
+                TranslationUnit = 19
+            };
+
             public enum struct AccessSpecifier
             {
                 Private = 0,
@@ -226,7 +270,13 @@ namespace CppSharp
 
                 Type(::CppSharp::CppParser::AST::Type* native);
                 Type(System::IntPtr native);
-                Type();
+                Type(CppSharp::Parser::AST::TypeKind kind);
+
+                property CppSharp::Parser::AST::TypeKind Kind
+                {
+                    CppSharp::Parser::AST::TypeKind get();
+                    void set(CppSharp::Parser::AST::TypeKind);
+                }
 
                 property bool IsDependent
                 {
@@ -870,7 +920,7 @@ namespace CppSharp
 
                 Declaration(::CppSharp::CppParser::AST::Declaration* native);
                 Declaration(System::IntPtr native);
-                Declaration();
+                Declaration(CppSharp::Parser::AST::DeclarationKind kind);
 
                 property System::String^ Name
                 {
@@ -889,6 +939,12 @@ namespace CppSharp
                     unsigned int get();
                 }
 
+                property CppSharp::Parser::AST::DeclarationKind Kind
+                {
+                    CppSharp::Parser::AST::DeclarationKind get();
+                    void set(CppSharp::Parser::AST::DeclarationKind);
+                }
+
                 property CppSharp::Parser::AST::AccessSpecifier Access
                 {
                     CppSharp::Parser::AST::AccessSpecifier get();
@@ -1184,7 +1240,7 @@ namespace CppSharp
                     void set(bool);
                 }
 
-                property CppSharp::Parser::AST::CXXMethodKind Kind
+                property CppSharp::Parser::AST::CXXMethodKind MethodKind
                 {
                     CppSharp::Parser::AST::CXXMethodKind get();
                     void set(CppSharp::Parser::AST::CXXMethodKind);