From 5523a83b29f1f846a2dc7d4a6d80e3ab27b24cfb Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Tue, 1 Jul 2014 19:28:17 +0300 Subject: [PATCH] Converted all "complex" (for example participating in class hierarchies) data type to classes. Signed-off-by: Dimitar Dobrev --- src/CppParser/AST.h | 184 +++++++++++------- .../Bindings/CSharp/i686-pc-win32/AST.cs | 166 ++++++++-------- src/CppParser/CppParser.h | 4 +- src/CppParser/Parser.h | 3 +- 4 files changed, 201 insertions(+), 156 deletions(-) diff --git a/src/CppParser/AST.h b/src/CppParser/AST.h index bfe05d7e..b53e598c 100644 --- a/src/CppParser/AST.h +++ b/src/CppParser/AST.h @@ -14,7 +14,7 @@ namespace CppSharp { namespace CppParser { namespace AST { #pragma region Types -enum struct TypeKind +enum class TypeKind { Tag, Array, @@ -36,8 +36,9 @@ enum struct TypeKind #define DECLARE_TYPE_KIND(kind) \ kind##Type(); -struct CS_API Type +class CS_API Type { +public: Type(TypeKind kind); Type(const Type&); @@ -59,16 +60,18 @@ struct CS_API QualifiedType TypeQualifiers Qualifiers; }; -struct Declaration; +class Declaration; -struct CS_API TagType : public Type +class CS_API TagType : public Type { +public: DECLARE_TYPE_KIND(Tag) CppSharp::CppParser::AST::Declaration* Declaration; }; -struct CS_API ArrayType : public Type +class CS_API ArrayType : public Type { +public: enum class ArraySize { Constant, @@ -83,7 +86,7 @@ struct CS_API ArrayType : public Type long Size; }; -struct Parameter; +class Parameter; enum class CallingConvention { @@ -95,16 +98,18 @@ enum class CallingConvention Unknown }; -struct CS_API FunctionType : public Type +class CS_API FunctionType : public Type { +public: DECLARE_TYPE_KIND(Function) QualifiedType ReturnType; CppSharp::CppParser::AST::CallingConvention CallingConvention; VECTOR(Parameter*, Parameters) }; -struct CS_API PointerType : public Type +class CS_API PointerType : public Type { +public: enum struct TypeModifier { Value, @@ -118,29 +123,33 @@ struct CS_API PointerType : public Type TypeModifier Modifier; }; -struct CS_API MemberPointerType : public Type +class CS_API MemberPointerType : public Type { +public: DECLARE_TYPE_KIND(MemberPointer) QualifiedType Pointee; }; -struct TypedefDecl; +class TypedefDecl; -struct CS_API TypedefType : public Type +class CS_API TypedefType : public Type { +public: TypedefType(); TypedefDecl* Declaration; }; -struct CS_API AttributedType : public Type +class CS_API AttributedType : public Type { +public: DECLARE_TYPE_KIND(Attributed) QualifiedType Modified; QualifiedType Equivalent; }; -struct CS_API DecayedType : public Type +class CS_API DecayedType : public Type { +public: DECLARE_TYPE_KIND(Decayed) QualifiedType Decayed; QualifiedType Original; @@ -169,10 +178,11 @@ struct CS_API TemplateArgument long Integral; }; -struct Template; +class Template; -struct CS_API TemplateSpecializationType : public Type +class CS_API TemplateSpecializationType : public Type { +public: TemplateSpecializationType(); TemplateSpecializationType(const TemplateSpecializationType&); @@ -181,8 +191,9 @@ struct CS_API TemplateSpecializationType : public Type Type* Desugared; }; -struct CS_API TemplateParameter +class CS_API TemplateParameter { +public: TemplateParameter(); TemplateParameter(const TemplateParameter&); @@ -195,8 +206,9 @@ struct CS_API TemplateParameter bool IsTypeParameter; }; -struct CS_API TemplateParameterType : public Type +class CS_API TemplateParameterType : public Type { +public: DECLARE_TYPE_KIND(TemplateParameter) TemplateParameter Parameter; unsigned int Depth; @@ -204,32 +216,36 @@ struct CS_API TemplateParameterType : public Type bool IsParameterPack; }; -struct CS_API TemplateParameterSubstitutionType : public Type +class CS_API TemplateParameterSubstitutionType : public Type { +public: DECLARE_TYPE_KIND(TemplateParameterSubstitution) QualifiedType Replacement; }; -struct Class; +class Class; -struct CS_API InjectedClassNameType : public Type +class CS_API InjectedClassNameType : public Type { +public: InjectedClassNameType(); TemplateSpecializationType* TemplateSpecialization; CppSharp::CppParser::AST::Class* Class; }; -struct CS_API DependentNameType : public Type +class CS_API DependentNameType : public Type { +public: DECLARE_TYPE_KIND(DependentName) }; -struct CS_API PackExpansionType : public Type +class CS_API PackExpansionType : public Type { +public: DECLARE_TYPE_KIND(PackExpansion) }; -enum struct PrimitiveType +enum class PrimitiveType { Null, Void, @@ -250,8 +266,9 @@ enum struct PrimitiveType IntPtr }; -struct CS_API BuiltinType : public Type +class CS_API BuiltinType : public Type { +public: DECLARE_TYPE_KIND(Builtin) PrimitiveType Type; }; @@ -260,14 +277,14 @@ struct CS_API BuiltinType : public Type #pragma region ABI -enum struct CppAbi +enum class CppAbi { Itanium, Microsoft, ARM }; -enum struct VTableComponentKind +enum class VTableComponentKind { VCallOffset, VBaseOffset, @@ -321,7 +338,7 @@ struct CS_API ClassLayout #pragma region Declarations -enum struct DeclarationKind +enum class DeclarationKind { DeclarationContext, Typedef, @@ -349,19 +366,20 @@ enum struct DeclarationKind #define DECLARE_DECL_KIND(klass, kind) \ klass(); -enum struct AccessSpecifier +enum class AccessSpecifier { Private, Protected, Public }; -struct DeclarationContext; -struct RawComment; -struct PreprocessedEntity; +class DeclarationContext; +class RawComment; +class PreprocessedEntity; -struct CS_API Declaration +class CS_API Declaration { +public: Declaration(DeclarationKind kind); Declaration(const Declaration&); @@ -391,8 +409,9 @@ struct ClassTemplate; struct FunctionTemplate; struct Variable; -struct CS_API DeclarationContext : public Declaration +class CS_API DeclarationContext : public Declaration { +public: DeclarationContext(DeclarationKind kind); CS_IGNORE Declaration* FindAnonymous(const std::string& USR); @@ -429,14 +448,16 @@ struct CS_API DeclarationContext : public Declaration bool IsAnonymous; }; -struct CS_API TypedefDecl : public Declaration +class CS_API TypedefDecl : public Declaration { +public: DECLARE_DECL_KIND(TypedefDecl, Typedef) CppSharp::CppParser::AST::QualifiedType QualifiedType; }; -struct CS_API Parameter : public Declaration +class CS_API Parameter : public Declaration { +public: Parameter(); CppSharp::CppParser::AST::QualifiedType QualifiedType; @@ -445,7 +466,7 @@ struct CS_API Parameter : public Declaration unsigned int Index; }; -enum struct CXXMethodKind +enum class CXXMethodKind { Normal, Constructor, @@ -455,7 +476,7 @@ enum struct CXXMethodKind UsingDirective }; -enum struct CXXOperatorKind +enum class CXXOperatorKind { None, New, @@ -503,10 +524,11 @@ enum struct CXXOperatorKind Conditional }; -struct FunctionTemplateSpecialization; +class FunctionTemplateSpecialization; -struct CS_API Function : public Declaration +class CS_API Function : public Declaration { +public: Function(); QualifiedType ReturnType; @@ -524,10 +546,11 @@ struct CS_API Function : public Declaration FunctionTemplateSpecialization* SpecializationInfo; }; -struct AccessSpecifierDecl; +class AccessSpecifierDecl; -struct CS_API Method : public Function +class CS_API Method : public Function { +public: Method(); AccessSpecifierDecl* AccessDecl; @@ -548,12 +571,14 @@ struct CS_API Method : public Function QualifiedType ConversionType; }; -struct CS_API Enumeration : public DeclarationContext +class CS_API Enumeration : public DeclarationContext { +public: DECLARE_DECL_KIND(Enumeration, Enumeration) - struct CS_API Item : public Declaration + class CS_API Item : public Declaration { + public: DECLARE_DECL_KIND(Item, EnumerationItem) Item(const Item&); @@ -561,7 +586,7 @@ struct CS_API Enumeration : public DeclarationContext uint64_t Value; }; - enum struct CS_FLAGS EnumModifiers + enum class CS_FLAGS EnumModifiers { Anonymous = 1 << 0, Scoped = 1 << 1, @@ -576,15 +601,16 @@ struct CS_API Enumeration : public DeclarationContext Item* FindItemByName(const std::string& Name); }; -struct CS_API Variable : public Declaration +class CS_API Variable : public Declaration { +public: DECLARE_DECL_KIND(Variable, Variable) STRING(Mangled) CppSharp::CppParser::AST::QualifiedType QualifiedType; }; -struct PreprocessedEntity; +class PreprocessedEntity; struct CS_API BaseClassSpecifier { @@ -594,23 +620,26 @@ struct CS_API BaseClassSpecifier CppSharp::CppParser::AST::Type* Type; }; -struct Class; +class Class; -struct CS_API Field : public Declaration +class CS_API Field : public Declaration { +public: DECLARE_DECL_KIND(Field, Field) CppSharp::CppParser::AST::QualifiedType QualifiedType; unsigned Offset; CppSharp::CppParser::AST::Class* Class; }; -struct CS_API AccessSpecifierDecl : public Declaration +class CS_API AccessSpecifierDecl : public Declaration { +public: DECLARE_DECL_KIND(AccessSpecifierDecl, AccessSpecifier) }; -struct CS_API Class : public DeclarationContext +class CS_API Class : public DeclarationContext { +public: Class(); VECTOR(BaseClassSpecifier*, Bases) @@ -631,26 +660,28 @@ struct CS_API Class : public DeclarationContext ClassLayout* Layout; }; -struct CS_API Template : public Declaration +class CS_API Template : public Declaration { +public: Template(DeclarationKind kind); DECLARE_DECL_KIND(Template, Template) Declaration* TemplatedDecl; VECTOR(TemplateParameter, Parameters) }; -struct ClassTemplateSpecialization; -struct ClassTemplatePartialSpecialization; +class ClassTemplateSpecialization; +class ClassTemplatePartialSpecialization; -struct CS_API ClassTemplate : public Template +class CS_API ClassTemplate : public Template { +public: ClassTemplate(); VECTOR(ClassTemplateSpecialization*, Specializations) ClassTemplateSpecialization* FindSpecialization(const std::string& usr); ClassTemplatePartialSpecialization* FindPartialSpecialization(const std::string& usr); }; -enum struct TemplateSpecializationKind +enum class TemplateSpecializationKind { Undeclared, ImplicitInstantiation, @@ -659,28 +690,32 @@ enum struct TemplateSpecializationKind ExplicitInstantiationDefinition }; -struct CS_API ClassTemplateSpecialization : public Class +class CS_API ClassTemplateSpecialization : public Class { +public: ClassTemplateSpecialization(); ClassTemplate* TemplatedDecl; VECTOR(TemplateArgument, Arguments) TemplateSpecializationKind SpecializationKind; }; -struct CS_API ClassTemplatePartialSpecialization : public ClassTemplateSpecialization +class CS_API ClassTemplatePartialSpecialization : public ClassTemplateSpecialization { +public: ClassTemplatePartialSpecialization(); }; -struct CS_API FunctionTemplate : public Template +class CS_API FunctionTemplate : public Template { +public: FunctionTemplate(); VECTOR(FunctionTemplateSpecialization*, Specializations) FunctionTemplateSpecialization* FindSpecialization(const std::string& usr); }; -struct CS_API FunctionTemplateSpecialization +class CS_API FunctionTemplateSpecialization { +public: FunctionTemplateSpecialization(); FunctionTemplate* Template; VECTOR(TemplateArgument, Arguments) @@ -688,13 +723,14 @@ struct CS_API FunctionTemplateSpecialization TemplateSpecializationKind SpecializationKind; }; -struct CS_API Namespace : public DeclarationContext +class CS_API Namespace : public DeclarationContext { +public: Namespace(); bool IsInline; }; -enum struct MacroLocation +enum class MacroLocation { Unknown, ClassHead, @@ -704,27 +740,31 @@ enum struct MacroLocation FunctionBody, }; -struct CS_API PreprocessedEntity : public Declaration +class CS_API PreprocessedEntity : public Declaration { +public: PreprocessedEntity(); MacroLocation MacroLocation; }; -struct CS_API MacroDefinition : public PreprocessedEntity +class CS_API MacroDefinition : public PreprocessedEntity { +public: MacroDefinition(); STRING(Expression) }; -struct CS_API MacroExpansion : public PreprocessedEntity +class CS_API MacroExpansion : public PreprocessedEntity { +public: MacroExpansion(); STRING(Text) MacroDefinition* Definition; }; -struct CS_API TranslationUnit : public Namespace +class CS_API TranslationUnit : public Namespace { +public: TranslationUnit(); STRING(FileName) bool IsSystemHeader; @@ -737,8 +777,9 @@ struct CS_API NativeLibrary VECTOR_STRING(Symbols) }; -struct CS_API ASTContext +class CS_API ASTContext { +public: ASTContext(); TranslationUnit* FindOrCreateModule(std::string File); VECTOR(TranslationUnit*, TranslationUnits) @@ -753,18 +794,20 @@ enum struct CommentKind FullComment, }; -struct CS_API CS_ABSTRACT Comment +class CS_API CS_ABSTRACT Comment { +public: Comment(CommentKind kind); CommentKind Kind; }; -struct CS_API FullComment : public Comment +class CS_API FullComment : public Comment { +public: FullComment(); }; -enum struct RawCommentKind +enum class RawCommentKind { Invalid, OrdinaryBCPL, @@ -776,8 +819,9 @@ enum struct RawCommentKind Merged }; -struct CS_API RawComment +class CS_API RawComment { +public: RawComment(); RawCommentKind Kind; STRING(Text) diff --git a/src/CppParser/Bindings/CSharp/i686-pc-win32/AST.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32/AST.cs index f0cdecb2..1e67c22c 100644 --- a/src/CppParser/Bindings/CSharp/i686-pc-win32/AST.cs +++ b/src/CppParser/Bindings/CSharp/i686-pc-win32/AST.cs @@ -225,7 +225,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0Type@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0Type@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_1(global::System.IntPtr instance, global::System.IntPtr _0); } @@ -504,7 +504,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0TagType@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0TagType@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); } @@ -578,7 +578,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0ArrayType@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0ArrayType@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); } @@ -689,7 +689,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0FunctionType@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0FunctionType@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -699,12 +699,12 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?getParameters@FunctionType@AST@CppParser@CppSharp@@QAEPAUParameter@234@I@Z")] + EntryPoint="?getParameters@FunctionType@AST@CppParser@CppSharp@@QAEPAVParameter@234@I@Z")] internal static extern global::System.IntPtr getParameters_0(global::System.IntPtr instance, uint i); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?addParameters@FunctionType@AST@CppParser@CppSharp@@QAEXAAPAUParameter@234@@Z")] + EntryPoint="?addParameters@FunctionType@AST@CppParser@CppSharp@@QAEXAAPAVParameter@234@@Z")] internal static extern void addParameters_0(global::System.IntPtr instance, global::System.IntPtr s); [SuppressUnmanagedCodeSecurity] @@ -819,7 +819,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0PointerType@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0PointerType@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); } @@ -912,7 +912,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0MemberPointerType@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0MemberPointerType@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); } @@ -982,7 +982,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0TypedefType@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0TypedefType@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); } @@ -1053,7 +1053,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0AttributedType@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0AttributedType@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); } @@ -1146,7 +1146,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0DecayedType@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0DecayedType@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); } @@ -1390,7 +1390,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0TemplateSpecializationType@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0TemplateSpecializationType@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_1(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -1511,7 +1511,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0TemplateParameter@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0TemplateParameter@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_1(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -1521,7 +1521,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??8TemplateParameter@AST@CppParser@CppSharp@@QBE_NABU0123@@Z")] + EntryPoint="??8TemplateParameter@AST@CppParser@CppSharp@@QBE_NABV0123@@Z")] [return: MarshalAsAttribute(UnmanagedType.I1)] internal static extern bool OperatorEqualEqual_0(global::System.IntPtr instance, global::System.IntPtr param); @@ -1647,7 +1647,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0TemplateParameterType@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0TemplateParameterType@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -1767,7 +1767,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0TemplateParameterSubstitutionType@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0TemplateParameterSubstitutionType@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); } @@ -1840,7 +1840,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0InjectedClassNameType@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0InjectedClassNameType@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); } @@ -1920,7 +1920,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0DependentNameType@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0DependentNameType@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); } @@ -1970,7 +1970,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0PackExpansionType@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0PackExpansionType@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); } @@ -2023,7 +2023,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0BuiltinType@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0BuiltinType@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); } @@ -2668,7 +2668,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0Declaration@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0Declaration@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_1(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -2678,12 +2678,12 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?getPreprocessedEntities@Declaration@AST@CppParser@CppSharp@@QAEPAUPreprocessedEntity@234@I@Z")] + EntryPoint="?getPreprocessedEntities@Declaration@AST@CppParser@CppSharp@@QAEPAVPreprocessedEntity@234@I@Z")] internal static extern global::System.IntPtr getPreprocessedEntities_0(global::System.IntPtr instance, uint i); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?addPreprocessedEntities@Declaration@AST@CppParser@CppSharp@@QAEXAAPAUPreprocessedEntity@234@@Z")] + EntryPoint="?addPreprocessedEntities@Declaration@AST@CppParser@CppSharp@@QAEXAAPAVPreprocessedEntity@234@@Z")] internal static extern void addPreprocessedEntities_0(global::System.IntPtr instance, global::System.IntPtr s); [SuppressUnmanagedCodeSecurity] @@ -3000,7 +3000,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0DeclarationContext@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0DeclarationContext@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -3010,72 +3010,72 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?getNamespaces@DeclarationContext@AST@CppParser@CppSharp@@QAEPAUNamespace@234@I@Z")] + EntryPoint="?getNamespaces@DeclarationContext@AST@CppParser@CppSharp@@QAEPAVNamespace@234@I@Z")] internal static extern global::System.IntPtr getNamespaces_0(global::System.IntPtr instance, uint i); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?addNamespaces@DeclarationContext@AST@CppParser@CppSharp@@QAEXAAPAUNamespace@234@@Z")] + EntryPoint="?addNamespaces@DeclarationContext@AST@CppParser@CppSharp@@QAEXAAPAVNamespace@234@@Z")] internal static extern void addNamespaces_0(global::System.IntPtr instance, global::System.IntPtr s); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?getEnums@DeclarationContext@AST@CppParser@CppSharp@@QAEPAUEnumeration@234@I@Z")] + EntryPoint="?getEnums@DeclarationContext@AST@CppParser@CppSharp@@QAEPAVEnumeration@234@I@Z")] internal static extern global::System.IntPtr getEnums_0(global::System.IntPtr instance, uint i); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?addEnums@DeclarationContext@AST@CppParser@CppSharp@@QAEXAAPAUEnumeration@234@@Z")] + EntryPoint="?addEnums@DeclarationContext@AST@CppParser@CppSharp@@QAEXAAPAVEnumeration@234@@Z")] internal static extern void addEnums_0(global::System.IntPtr instance, global::System.IntPtr s); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?getFunctions@DeclarationContext@AST@CppParser@CppSharp@@QAEPAUFunction@234@I@Z")] + EntryPoint="?getFunctions@DeclarationContext@AST@CppParser@CppSharp@@QAEPAVFunction@234@I@Z")] internal static extern global::System.IntPtr getFunctions_0(global::System.IntPtr instance, uint i); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?addFunctions@DeclarationContext@AST@CppParser@CppSharp@@QAEXAAPAUFunction@234@@Z")] + EntryPoint="?addFunctions@DeclarationContext@AST@CppParser@CppSharp@@QAEXAAPAVFunction@234@@Z")] internal static extern void addFunctions_0(global::System.IntPtr instance, global::System.IntPtr s); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?getClasses@DeclarationContext@AST@CppParser@CppSharp@@QAEPAUClass@234@I@Z")] + EntryPoint="?getClasses@DeclarationContext@AST@CppParser@CppSharp@@QAEPAVClass@234@I@Z")] internal static extern global::System.IntPtr getClasses_0(global::System.IntPtr instance, uint i); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?addClasses@DeclarationContext@AST@CppParser@CppSharp@@QAEXAAPAUClass@234@@Z")] + EntryPoint="?addClasses@DeclarationContext@AST@CppParser@CppSharp@@QAEXAAPAVClass@234@@Z")] internal static extern void addClasses_0(global::System.IntPtr instance, global::System.IntPtr s); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?getTemplates@DeclarationContext@AST@CppParser@CppSharp@@QAEPAUTemplate@234@I@Z")] + EntryPoint="?getTemplates@DeclarationContext@AST@CppParser@CppSharp@@QAEPAVTemplate@234@I@Z")] internal static extern global::System.IntPtr getTemplates_0(global::System.IntPtr instance, uint i); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?addTemplates@DeclarationContext@AST@CppParser@CppSharp@@QAEXAAPAUTemplate@234@@Z")] + EntryPoint="?addTemplates@DeclarationContext@AST@CppParser@CppSharp@@QAEXAAPAVTemplate@234@@Z")] internal static extern void addTemplates_0(global::System.IntPtr instance, global::System.IntPtr s); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?getTypedefs@DeclarationContext@AST@CppParser@CppSharp@@QAEPAUTypedefDecl@234@I@Z")] + EntryPoint="?getTypedefs@DeclarationContext@AST@CppParser@CppSharp@@QAEPAVTypedefDecl@234@I@Z")] internal static extern global::System.IntPtr getTypedefs_0(global::System.IntPtr instance, uint i); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?addTypedefs@DeclarationContext@AST@CppParser@CppSharp@@QAEXAAPAUTypedefDecl@234@@Z")] + EntryPoint="?addTypedefs@DeclarationContext@AST@CppParser@CppSharp@@QAEXAAPAVTypedefDecl@234@@Z")] internal static extern void addTypedefs_0(global::System.IntPtr instance, global::System.IntPtr s); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?getVariables@DeclarationContext@AST@CppParser@CppSharp@@QAEPAUVariable@234@I@Z")] + EntryPoint="?getVariables@DeclarationContext@AST@CppParser@CppSharp@@QAEPAVVariable@234@I@Z")] internal static extern global::System.IntPtr getVariables_0(global::System.IntPtr instance, uint i); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?addVariables@DeclarationContext@AST@CppParser@CppSharp@@QAEXAAPAUVariable@234@@Z")] + EntryPoint="?addVariables@DeclarationContext@AST@CppParser@CppSharp@@QAEXAAPAVVariable@234@@Z")] internal static extern void addVariables_0(global::System.IntPtr instance, global::System.IntPtr s); [SuppressUnmanagedCodeSecurity] @@ -3357,7 +3357,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0TypedefDecl@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0TypedefDecl@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -3465,7 +3465,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0Parameter@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0Parameter@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -3633,7 +3633,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0Function@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0Function@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -3643,12 +3643,12 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?getParameters@Function@AST@CppParser@CppSharp@@QAEPAUParameter@234@I@Z")] + EntryPoint="?getParameters@Function@AST@CppParser@CppSharp@@QAEPAVParameter@234@I@Z")] internal static extern global::System.IntPtr getParameters_0(global::System.IntPtr instance, uint i); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?addParameters@Function@AST@CppParser@CppSharp@@QAEXAAPAUParameter@234@@Z")] + EntryPoint="?addParameters@Function@AST@CppParser@CppSharp@@QAEXAAPAVParameter@234@@Z")] internal static extern void addParameters_0(global::System.IntPtr instance, global::System.IntPtr s); [SuppressUnmanagedCodeSecurity] @@ -4003,7 +4003,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0Method@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0Method@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_1(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -4276,7 +4276,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0Enumeration@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0Enumeration@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -4286,12 +4286,12 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?getItems@Enumeration@AST@CppParser@CppSharp@@QAE?AUItem@1234@I@Z")] + EntryPoint="?getItems@Enumeration@AST@CppParser@CppSharp@@QAE?AVItem@1234@I@Z")] internal static extern void getItems_0(global::System.IntPtr instance, global::System.IntPtr @return, uint i); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?addItems@Enumeration@AST@CppParser@CppSharp@@QAEXAAUItem@1234@@Z")] + EntryPoint="?addItems@Enumeration@AST@CppParser@CppSharp@@QAEXAAVItem@1234@@Z")] internal static extern void addItems_0(global::System.IntPtr instance, global::System.IntPtr s); [SuppressUnmanagedCodeSecurity] @@ -4353,7 +4353,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0Item@Enumeration@AST@CppParser@CppSharp@@QAE@ABU01234@@Z")] + EntryPoint="??0Item@Enumeration@AST@CppParser@CppSharp@@QAE@ABV01234@@Z")] internal static extern global::System.IntPtr cctor_1(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -4574,7 +4574,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0Variable@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0Variable@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -4811,7 +4811,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0Field@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0Field@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -4937,7 +4937,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0AccessSpecifierDecl@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0AccessSpecifierDecl@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -5049,7 +5049,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0Class@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0Class@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -5069,32 +5069,32 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?getFields@Class@AST@CppParser@CppSharp@@QAEPAUField@234@I@Z")] + EntryPoint="?getFields@Class@AST@CppParser@CppSharp@@QAEPAVField@234@I@Z")] internal static extern global::System.IntPtr getFields_0(global::System.IntPtr instance, uint i); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?addFields@Class@AST@CppParser@CppSharp@@QAEXAAPAUField@234@@Z")] + EntryPoint="?addFields@Class@AST@CppParser@CppSharp@@QAEXAAPAVField@234@@Z")] internal static extern void addFields_0(global::System.IntPtr instance, global::System.IntPtr s); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?getMethods@Class@AST@CppParser@CppSharp@@QAEPAUMethod@234@I@Z")] + EntryPoint="?getMethods@Class@AST@CppParser@CppSharp@@QAEPAVMethod@234@I@Z")] internal static extern global::System.IntPtr getMethods_0(global::System.IntPtr instance, uint i); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?addMethods@Class@AST@CppParser@CppSharp@@QAEXAAPAUMethod@234@@Z")] + EntryPoint="?addMethods@Class@AST@CppParser@CppSharp@@QAEXAAPAVMethod@234@@Z")] internal static extern void addMethods_0(global::System.IntPtr instance, global::System.IntPtr s); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?getSpecifiers@Class@AST@CppParser@CppSharp@@QAEPAUAccessSpecifierDecl@234@I@Z")] + EntryPoint="?getSpecifiers@Class@AST@CppParser@CppSharp@@QAEPAVAccessSpecifierDecl@234@I@Z")] internal static extern global::System.IntPtr getSpecifiers_0(global::System.IntPtr instance, uint i); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?addSpecifiers@Class@AST@CppParser@CppSharp@@QAEXAAPAUAccessSpecifierDecl@234@@Z")] + EntryPoint="?addSpecifiers@Class@AST@CppParser@CppSharp@@QAEXAAPAVAccessSpecifierDecl@234@@Z")] internal static extern void addSpecifiers_0(global::System.IntPtr instance, global::System.IntPtr s); [SuppressUnmanagedCodeSecurity] @@ -5434,7 +5434,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0Template@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0Template@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_3(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -5444,12 +5444,12 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?getParameters@Template@AST@CppParser@CppSharp@@QAE?AUTemplateParameter@234@I@Z")] + EntryPoint="?getParameters@Template@AST@CppParser@CppSharp@@QAE?AVTemplateParameter@234@I@Z")] internal static extern void getParameters_0(global::System.IntPtr instance, global::System.IntPtr @return, uint i); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?addParameters@Template@AST@CppParser@CppSharp@@QAEXAAUTemplateParameter@234@@Z")] + EntryPoint="?addParameters@Template@AST@CppParser@CppSharp@@QAEXAAVTemplateParameter@234@@Z")] internal static extern void addParameters_0(global::System.IntPtr instance, global::System.IntPtr s); [SuppressUnmanagedCodeSecurity] @@ -5578,7 +5578,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0ClassTemplate@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0ClassTemplate@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -5588,12 +5588,12 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?getSpecializations@ClassTemplate@AST@CppParser@CppSharp@@QAEPAUClassTemplateSpecialization@234@I@Z")] + EntryPoint="?getSpecializations@ClassTemplate@AST@CppParser@CppSharp@@QAEPAVClassTemplateSpecialization@234@I@Z")] internal static extern global::System.IntPtr getSpecializations_0(global::System.IntPtr instance, uint i); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?addSpecializations@ClassTemplate@AST@CppParser@CppSharp@@QAEXAAPAUClassTemplateSpecialization@234@@Z")] + EntryPoint="?addSpecializations@ClassTemplate@AST@CppParser@CppSharp@@QAEXAAPAVClassTemplateSpecialization@234@@Z")] internal static extern void addSpecializations_0(global::System.IntPtr instance, global::System.IntPtr s); [SuppressUnmanagedCodeSecurity] @@ -5733,7 +5733,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0ClassTemplateSpecialization@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0ClassTemplateSpecialization@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -5920,7 +5920,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0ClassTemplatePartialSpecialization@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0ClassTemplatePartialSpecialization@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_1(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -6002,7 +6002,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0FunctionTemplate@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0FunctionTemplate@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -6012,12 +6012,12 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?getSpecializations@FunctionTemplate@AST@CppParser@CppSharp@@QAEPAUFunctionTemplateSpecialization@234@I@Z")] + EntryPoint="?getSpecializations@FunctionTemplate@AST@CppParser@CppSharp@@QAEPAVFunctionTemplateSpecialization@234@I@Z")] internal static extern global::System.IntPtr getSpecializations_0(global::System.IntPtr instance, uint i); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?addSpecializations@FunctionTemplate@AST@CppParser@CppSharp@@QAEXAAPAUFunctionTemplateSpecialization@234@@Z")] + EntryPoint="?addSpecializations@FunctionTemplate@AST@CppParser@CppSharp@@QAEXAAPAVFunctionTemplateSpecialization@234@@Z")] internal static extern void addSpecializations_0(global::System.IntPtr instance, global::System.IntPtr s); [SuppressUnmanagedCodeSecurity] @@ -6097,7 +6097,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0FunctionTemplateSpecialization@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0FunctionTemplateSpecialization@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -6274,7 +6274,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0Namespace@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0Namespace@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_1(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -6371,7 +6371,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0PreprocessedEntity@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0PreprocessedEntity@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -6468,7 +6468,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0MacroDefinition@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0MacroDefinition@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -6580,7 +6580,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0MacroExpansion@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0MacroExpansion@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -6710,7 +6710,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0TranslationUnit@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0TranslationUnit@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -6720,12 +6720,12 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?getMacros@TranslationUnit@AST@CppParser@CppSharp@@QAEPAUMacroDefinition@234@I@Z")] + EntryPoint="?getMacros@TranslationUnit@AST@CppParser@CppSharp@@QAEPAVMacroDefinition@234@I@Z")] internal static extern global::System.IntPtr getMacros_0(global::System.IntPtr instance, uint i); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?addMacros@TranslationUnit@AST@CppParser@CppSharp@@QAEXAAPAUMacroDefinition@234@@Z")] + EntryPoint="?addMacros@TranslationUnit@AST@CppParser@CppSharp@@QAEXAAPAVMacroDefinition@234@@Z")] internal static extern void addMacros_0(global::System.IntPtr instance, global::System.IntPtr s); [SuppressUnmanagedCodeSecurity] @@ -6960,7 +6960,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0ASTContext@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0ASTContext@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] @@ -6970,12 +6970,12 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?getTranslationUnits@ASTContext@AST@CppParser@CppSharp@@QAEPAUTranslationUnit@234@I@Z")] + EntryPoint="?getTranslationUnits@ASTContext@AST@CppParser@CppSharp@@QAEPAVTranslationUnit@234@I@Z")] internal static extern global::System.IntPtr getTranslationUnits_0(global::System.IntPtr instance, uint i); [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="?addTranslationUnits@ASTContext@AST@CppParser@CppSharp@@QAEXAAPAUTranslationUnit@234@@Z")] + EntryPoint="?addTranslationUnits@ASTContext@AST@CppParser@CppSharp@@QAEXAAPAVTranslationUnit@234@@Z")] internal static extern void addTranslationUnits_0(global::System.IntPtr instance, global::System.IntPtr s); [SuppressUnmanagedCodeSecurity] @@ -7057,7 +7057,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0Comment@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0Comment@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_1(global::System.IntPtr instance, global::System.IntPtr _0); } @@ -7127,7 +7127,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0FullComment@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0FullComment@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_1(global::System.IntPtr instance, global::System.IntPtr _0); } @@ -7177,7 +7177,7 @@ namespace CppSharp [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0RawComment@AST@CppParser@CppSharp@@QAE@ABU0123@@Z")] + EntryPoint="??0RawComment@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] internal static extern global::System.IntPtr cctor_2(global::System.IntPtr instance, global::System.IntPtr _0); [SuppressUnmanagedCodeSecurity] diff --git a/src/CppParser/CppParser.h b/src/CppParser/CppParser.h index 2e7b9568..e0ccd227 100644 --- a/src/CppParser/CppParser.h +++ b/src/CppParser/CppParser.h @@ -42,7 +42,7 @@ struct CS_API ParserOptions bool Verbose; }; -enum struct ParserDiagnosticLevel +enum class ParserDiagnosticLevel { Ignored, Note, @@ -63,7 +63,7 @@ struct CS_API ParserDiagnostic int ColumnNumber; }; -enum struct ParserResultKind +enum class ParserResultKind { Success, Error, diff --git a/src/CppParser/Parser.h b/src/CppParser/Parser.h index 8af48158..52c08f72 100644 --- a/src/CppParser/Parser.h +++ b/src/CppParser/Parser.h @@ -39,8 +39,9 @@ namespace clang { namespace CppSharp { namespace CppParser { -struct Parser +class Parser { +public: Parser(ParserOptions* Opts); void SetupHeader();