Cleanup

src/CppParser/Decl.h

@@ -10,14 +10,13 @@
 #include "Helpers.h"
 #include "Sources.h"
 #include "Types.h"
+
 #include <algorithm>
 
-namespace CppSharp {
+namespace CppSharp::CppParser::AST {
-namespace CppParser {
-namespace AST {
 
-    enum class DeclarationKind
+enum class DeclarationKind
-    {
+{
     DeclarationContext,
     Typedef,
     TypeAlias,
@@ -49,26 +48,26 @@ namespace AST {
     VarTemplateSpecialization,
     VarTemplatePartialSpecialization,
     UnresolvedUsingTypename,
-    };
+};
 
 #define DECLARE_DECL_KIND(klass, kind) \
     klass();
 
-    enum class AccessSpecifier
+enum class AccessSpecifier
-    {
+{
     Private,
     Protected,
     Public
-    };
+};
 
-    class DeclarationContext;
+class DeclarationContext;
-    class RawComment;
+class RawComment;
-    class PreprocessedEntity;
+class PreprocessedEntity;
 
-    class ExpressionObsolete;
+class ExpressionObsolete;
-    class CS_API Declaration
+class CS_API Declaration
-    {
+{
-    public:
+public:
     Declaration(DeclarationKind kind);
     Declaration(const Declaration&);
     ~Declaration();
@@ -95,24 +94,24 @@ namespace AST {
     VECTOR(Declaration*, Redeclarations)
     void* originalPtr;
     RawComment* comment;
-    };
+};
-
+
-    class Class;
+class Class;
-    class Enumeration;
+class Enumeration;
-    class Function;
+class Function;
-    class TypedefDecl;
+class TypedefDecl;
-    class TypeAlias;
+class TypeAlias;
-    class Namespace;
+class Namespace;
-    class Template;
+class Template;
-    class TypeAliasTemplate;
+class TypeAliasTemplate;
-    class ClassTemplate;
+class ClassTemplate;
-    class FunctionTemplate;
+class FunctionTemplate;
-    class Variable;
+class Variable;
-    class Friend;
+class Friend;
-
+
-    class CS_API DeclarationContext : public Declaration
+class CS_API DeclarationContext : public Declaration
-    {
+{
-    public:
+public:
     DeclarationContext(DeclarationKind kind);
 
     CS_IGNORE Declaration* FindAnonymous(const std::string& USR);
@@ -155,41 +154,41 @@ namespace AST {
     std::map<std::string, Declaration*> anonymous;
 
     bool isAnonymous;
-    };
+};
 
-    class CS_API TypedefNameDecl : public Declaration
+class CS_API TypedefNameDecl : public Declaration
-    {
+{
-    public:
+public:
     TypedefNameDecl(DeclarationKind kind);
     ~TypedefNameDecl();
     QualifiedType qualifiedType;
-    };
+};
 
-    class CS_API TypedefDecl : public TypedefNameDecl
+class CS_API TypedefDecl : public TypedefNameDecl
-    {
+{
-    public:
+public:
     DECLARE_DECL_KIND(TypedefDecl, Typedef)
     ~TypedefDecl();
-    };
+};
 
-    class CS_API TypeAlias : public TypedefNameDecl
+class CS_API TypeAlias : public TypedefNameDecl
-    {
+{
-    public:
+public:
     TypeAlias();
     ~TypeAlias();
     TypeAliasTemplate* describedAliasTemplate;
-    };
+};
 
-    class CS_API Friend : public Declaration
+class CS_API Friend : public Declaration
-    {
+{
-    public:
+public:
     DECLARE_DECL_KIND(Friend, Friend)
     ~Friend();
     Declaration* declaration;
-    };
+};
 
-    enum class StatementClassObsolete
+enum class StatementClassObsolete
-    {
+{
     Any,
     BinaryOperator,
     CallExprClass,
@@ -198,54 +197,54 @@ namespace AST {
     CXXOperatorCallExpr,
     ImplicitCastExpr,
     ExplicitCastExpr,
-    };
+};
 
-    class CS_API StatementObsolete
+class CS_API StatementObsolete
-    {
+{
-    public:
+public:
     StatementObsolete(const std::string& str, StatementClassObsolete Class = StatementClassObsolete::Any, Declaration* decl = 0);
     StatementClassObsolete _class;
     Declaration* decl;
     std::string string;
-    };
+};
 
-    class CS_API ExpressionObsolete : public StatementObsolete
+class CS_API ExpressionObsolete : public StatementObsolete
-    {
+{
-    public:
+public:
     ExpressionObsolete(const std::string& str, StatementClassObsolete Class = StatementClassObsolete::Any, Declaration* decl = 0);
-    };
+};
 
-    class Expr;
+class Expr;
 
-    class CS_API BinaryOperatorObsolete : public ExpressionObsolete
+class CS_API BinaryOperatorObsolete : public ExpressionObsolete
-    {
+{
-    public:
+public:
     BinaryOperatorObsolete(const std::string& str, ExpressionObsolete* lhs, ExpressionObsolete* rhs, const std::string& opcodeStr);
     ~BinaryOperatorObsolete();
     ExpressionObsolete* LHS;
     ExpressionObsolete* RHS;
     std::string opcodeStr;
-    };
+};
 
-    class CS_API CallExprObsolete : public ExpressionObsolete
+class CS_API CallExprObsolete : public ExpressionObsolete
-    {
+{
-    public:
+public:
     CallExprObsolete(const std::string& str, Declaration* decl);
     ~CallExprObsolete();
     VECTOR(ExpressionObsolete*, Arguments)
-    };
+};
 
-    class CS_API CXXConstructExprObsolete : public ExpressionObsolete
+class CS_API CXXConstructExprObsolete : public ExpressionObsolete
-    {
+{
-    public:
+public:
     CXXConstructExprObsolete(const std::string& str, Declaration* decl = 0);
     ~CXXConstructExprObsolete();
     VECTOR(ExpressionObsolete*, Arguments)
-    };
+};
 
-    class CS_API Parameter : public Declaration
+class CS_API Parameter : public Declaration
-    {
+{
-    public:
+public:
     Parameter();
     ~Parameter();
 
@@ -255,20 +254,20 @@ namespace AST {
     unsigned int index;
     ExpressionObsolete* defaultArgument;
     Expr* defaultValue;
-    };
+};
 
-    enum class CXXMethodKind
+enum class CXXMethodKind
-    {
+{
     Normal,
     Constructor,
     Destructor,
     Conversion,
     Operator,
     UsingDirective
-    };
+};
 
-    enum class CXXOperatorKind
+enum class CXXOperatorKind
-    {
+{
     None,
     New,
     Delete,
@@ -315,22 +314,22 @@ namespace AST {
     Subscript,
     Conditional,
     Coawait
-    };
+};
 
-    class FunctionTemplateSpecialization;
+class FunctionTemplateSpecialization;
 
-    enum class FriendKind
+enum class FriendKind
-    {
+{
     None,
     Declared,
     Undeclared
-    };
+};
 
-    class Stmt;
+class Stmt;
 
-    class CS_API Function : public DeclarationContext
+class CS_API Function : public DeclarationContext
-    {
+{
-    public:
+public:
     Function();
     ~Function();
 
@@ -355,20 +354,20 @@ namespace AST {
     FunctionTemplateSpecialization* specializationInfo;
     Function* instantiatedFrom;
     QualifiedType qualifiedType;
-    };
+};
 
-    class AccessSpecifierDecl;
+class AccessSpecifierDecl;
 
-    enum class RefQualifierKind
+enum class RefQualifierKind
-    {
+{
     None,
     LValue,
     RValue
-    };
+};
 
-    class CS_API Method : public Function
+class CS_API Method : public Function
-    {
+{
-    public:
+public:
     Method();
     ~Method();
 
@@ -387,11 +386,11 @@ namespace AST {
     QualifiedType conversionType;
     RefQualifierKind refQualifier;
     VECTOR(Method*, OverriddenMethods)
-    };
+};
 
-    class CS_API Enumeration : public DeclarationContext
+class CS_API Enumeration : public DeclarationContext
-    {
+{
-    public:
+public:
     DECLARE_DECL_KIND(Enumeration, Enumeration)
     ~Enumeration();
 
@@ -418,52 +417,52 @@ namespace AST {
     VECTOR(Item*, Items)
 
     Item* FindItemByName(const std::string& Name);
-    };
+};
 
-    class CS_API Variable : public Declaration
+class CS_API Variable : public Declaration
-    {
+{
-    public:
+public:
     DECLARE_DECL_KIND(Variable, Variable)
     ~Variable();
     bool isConstExpr;
     std::string mangled;
     QualifiedType qualifiedType;
     ExpressionObsolete* initializer;
-    };
+};
 
-    class PreprocessedEntity;
+class PreprocessedEntity;
 
-    struct CS_API BaseClassSpecifier
+struct CS_API BaseClassSpecifier
-    {
+{
     BaseClassSpecifier();
     AccessSpecifier access;
     bool isVirtual;
     Type* type;
     int offset;
-    };
+};
 
-    class Class;
+class Class;
 
-    class CS_API Field : public Declaration
+class CS_API Field : public Declaration
-    {
+{
-    public:
+public:
     DECLARE_DECL_KIND(Field, Field)
     ~Field();
     QualifiedType qualifiedType;
     Class* _class;
     bool isBitField;
     unsigned bitWidth;
-    };
+};
 
-    class CS_API AccessSpecifierDecl : public Declaration
+class CS_API AccessSpecifierDecl : public Declaration
-    {
+{
-    public:
+public:
     DECLARE_DECL_KIND(AccessSpecifierDecl, AccessSpecifier)
     ~AccessSpecifierDecl();
-    };
+};
 
-    enum class CppAbi
+enum class CppAbi
-    {
+{
     Itanium,
     Microsoft,
     ARM,
@@ -471,10 +470,10 @@ namespace AST {
     iOS,
     AppleARM64,
     WebAssembly
-    };
+};
 
-    enum class VTableComponentKind
+enum class VTableComponentKind
-    {
+{
     VCallOffset,
     VBaseOffset,
     OffsetToTop,
@@ -483,37 +482,37 @@ namespace AST {
     CompleteDtorPointer,
     DeletingDtorPointer,
     UnusedFunctionPointer,
-    };
+};
 
-    struct CS_API VTableComponent
+struct CS_API VTableComponent
-    {
+{
     VTableComponent();
     VTableComponentKind kind;
     unsigned offset;
     Declaration* declaration;
-    };
+};
 
-    struct CS_API VTableLayout
+struct CS_API VTableLayout
-    {
+{
     VTableLayout();
     VTableLayout(const VTableLayout&);
     ~VTableLayout();
     VECTOR(VTableComponent, Components)
-    };
+};
 
-    struct CS_API VFTableInfo
+struct CS_API VFTableInfo
-    {
+{
     VFTableInfo();
     VFTableInfo(const VFTableInfo&);
     uint64_t VBTableIndex;
     uint32_t VFPtrOffset;
     uint32_t VFPtrFullOffset;
     VTableLayout layout;
-    };
+};
 
-    class CS_API LayoutField
+class CS_API LayoutField
-    {
+{
-    public:
+public:
     LayoutField();
     LayoutField(const LayoutField& other);
     ~LayoutField();
@@ -521,22 +520,22 @@ namespace AST {
     std::string name;
     QualifiedType qualifiedType;
     void* fieldPtr;
-    };
+};
 
-    class Class;
+class Class;
 
-    class CS_API LayoutBase
+class CS_API LayoutBase
-    {
+{
-    public:
+public:
     LayoutBase();
     LayoutBase(const LayoutBase& other);
     ~LayoutBase();
     unsigned offset;
     Class* _class;
-    };
+};
 
-    enum class RecordArgABI
+enum class RecordArgABI
-    {
+{
     /// Pass it using the normal C aggregate rules for the ABI,
     /// potentially introducing extra copies and passing some
     /// or all of it in registers.
@@ -548,10 +547,10 @@ namespace AST {
     DirectInMemory,
     /// Pass it as a pointer to temporary memory.
     Indirect
-    };
+};
 
-    struct CS_API ClassLayout
+struct CS_API ClassLayout
-    {
+{
     ClassLayout();
     CppAbi ABI;
     RecordArgABI argABI;
@@ -564,11 +563,11 @@ namespace AST {
     int dataSize;
     VECTOR(LayoutField, Fields)
     VECTOR(LayoutBase, Bases)
-    };
+};
 
-    class CS_API Class : public DeclarationContext
+class CS_API Class : public DeclarationContext
-    {
+{
-    public:
+public:
     Class();
     ~Class();
 
@@ -590,20 +589,20 @@ namespace AST {
     TagKind tagKind;
 
     ClassLayout* layout;
-    };
+};
 
-    class CS_API Template : public Declaration
+class CS_API Template : public Declaration
-    {
+{
-    public:
+public:
     Template(DeclarationKind kind);
     DECLARE_DECL_KIND(Template, Template)
     Declaration* TemplatedDecl;
     VECTOR(Declaration*, Parameters)
-    };
+};
 
-    template <typename T>
+template <typename T>
-    T* DeclarationContext::FindTemplate(const std::string& USR)
+T* DeclarationContext::FindTemplate(const std::string& USR)
-    {
+{
     auto foundTemplate = std::find_if(Templates.begin(), Templates.end(),
                                       [&](Template* t)
                                       {
@@ -614,51 +613,51 @@ namespace AST {
         return static_cast<T*>(*foundTemplate);
 
     return nullptr;
-    }
+}
 
-    class CS_API TypeAliasTemplate : public Template
+class CS_API TypeAliasTemplate : public Template
-    {
+{
-    public:
+public:
     TypeAliasTemplate();
     ~TypeAliasTemplate();
 
     Declaration* CanonicalDecl = nullptr;
-    };
+};
 
-    class CS_API TemplateParameter : public Declaration
+class CS_API TemplateParameter : public Declaration
-    {
+{
-    public:
+public:
     TemplateParameter(DeclarationKind kind);
     ~TemplateParameter();
     unsigned int depth;
     unsigned int index;
     bool isParameterPack;
-    };
+};
 
-    class CS_API TemplateTemplateParameter : public Template
+class CS_API TemplateTemplateParameter : public Template
-    {
+{
-    public:
+public:
     TemplateTemplateParameter();
     ~TemplateTemplateParameter();
 
     bool isParameterPack;
     bool isPackExpansion;
     bool isExpandedParameterPack;
-    };
+};
 
-    class CS_API TypeTemplateParameter : public TemplateParameter
+class CS_API TypeTemplateParameter : public TemplateParameter
-    {
+{
-    public:
+public:
     TypeTemplateParameter();
     TypeTemplateParameter(const TypeTemplateParameter&);
     ~TypeTemplateParameter();
 
     QualifiedType defaultArgument;
-    };
+};
 
-    class CS_API NonTypeTemplateParameter : public TemplateParameter
+class CS_API NonTypeTemplateParameter : public TemplateParameter
-    {
+{
-    public:
+public:
     NonTypeTemplateParameter();
     NonTypeTemplateParameter(const NonTypeTemplateParameter&);
     ~NonTypeTemplateParameter();
@@ -668,172 +667,169 @@ namespace AST {
     bool isPackExpansion;
     bool isExpandedParameterPack;
     QualifiedType type;
-    };
+};
 
-    class ClassTemplateSpecialization;
+class ClassTemplateSpecialization;
-    class ClassTemplatePartialSpecialization;
+class ClassTemplatePartialSpecialization;
 
-    class CS_API ClassTemplate : public Template
+class CS_API ClassTemplate : public Template
-    {
+{
-    public:
+public:
     ClassTemplate();
     ~ClassTemplate();
     VECTOR(ClassTemplateSpecialization*, Specializations)
     ClassTemplateSpecialization* FindSpecialization(const std::string& usr);
     ClassTemplatePartialSpecialization* FindPartialSpecialization(const std::string& usr);
-    };
+};
 
-    enum class TemplateSpecializationKind
+enum class TemplateSpecializationKind
-    {
+{
     Undeclared,
     ImplicitInstantiation,
     ExplicitSpecialization,
     ExplicitInstantiationDeclaration,
     ExplicitInstantiationDefinition
-    };
+};
 
-    class CS_API ClassTemplateSpecialization : public Class
+class CS_API ClassTemplateSpecialization : public Class
-    {
+{
-    public:
+public:
     ClassTemplateSpecialization();
     ~ClassTemplateSpecialization();
     ClassTemplate* templatedDecl;
     VECTOR(TemplateArgument, Arguments)
     TemplateSpecializationKind specializationKind;
-    };
+};
 
-    class CS_API ClassTemplatePartialSpecialization : public ClassTemplateSpecialization
+class CS_API ClassTemplatePartialSpecialization : public ClassTemplateSpecialization
-    {
+{
-    public:
+public:
     ClassTemplatePartialSpecialization();
     ~ClassTemplatePartialSpecialization();
     VECTOR(Declaration*, Parameters)
-    };
+};
 
-    class CS_API FunctionTemplate : public Template
+class CS_API FunctionTemplate : public Template
-    {
+{
-    public:
+public:
     FunctionTemplate();
     ~FunctionTemplate();
     VECTOR(FunctionTemplateSpecialization*, Specializations)
     FunctionTemplateSpecialization* FindSpecialization(const std::string& usr);
-    };
+};
 
-    class CS_API FunctionTemplateSpecialization
+class CS_API FunctionTemplateSpecialization
-    {
+{
-    public:
+public:
     FunctionTemplateSpecialization();
     ~FunctionTemplateSpecialization();
     FunctionTemplate* _template;
     VECTOR(TemplateArgument, Arguments)
     Function* specializedFunction;
     TemplateSpecializationKind specializationKind;
-    };
+};
 
-    class VarTemplateSpecialization;
+class VarTemplateSpecialization;
-    class VarTemplatePartialSpecialization;
+class VarTemplatePartialSpecialization;
 
-    class CS_API VarTemplate : public Template
+class CS_API VarTemplate : public Template
-    {
+{
-    public:
+public:
     VarTemplate();
     ~VarTemplate();
     VECTOR(VarTemplateSpecialization*, Specializations)
     VarTemplateSpecialization* FindSpecialization(const std::string& usr);
     VarTemplatePartialSpecialization* FindPartialSpecialization(const std::string& usr);
-    };
+};
 
-    class CS_API VarTemplateSpecialization : public Variable
+class CS_API VarTemplateSpecialization : public Variable
-    {
+{
-    public:
+public:
     VarTemplateSpecialization();
     ~VarTemplateSpecialization();
     VarTemplate* templatedDecl;
     VECTOR(TemplateArgument, Arguments)
     TemplateSpecializationKind specializationKind;
-    };
+};
 
-    class CS_API VarTemplatePartialSpecialization : public VarTemplateSpecialization
+class CS_API VarTemplatePartialSpecialization : public VarTemplateSpecialization
-    {
+{
-    public:
+public:
     VarTemplatePartialSpecialization();
     ~VarTemplatePartialSpecialization();
-    };
+};
 
-    class CS_API UnresolvedUsingTypename : public Declaration
+class CS_API UnresolvedUsingTypename : public Declaration
-    {
+{
-    public:
+public:
     UnresolvedUsingTypename();
     ~UnresolvedUsingTypename();
-    };
+};
 
-    class CS_API Namespace : public DeclarationContext
+class CS_API Namespace : public DeclarationContext
-    {
+{
-    public:
+public:
     Namespace();
     ~Namespace();
     bool isInline;
-    };
+};
 
-    enum class MacroLocation
+enum class MacroLocation
-    {
+{
     Unknown,
     ClassHead,
     ClassBody,
     FunctionHead,
     FunctionParameters,
     FunctionBody,
-    };
+};
 
-    class CS_API PreprocessedEntity
+class CS_API PreprocessedEntity
-    {
+{
-    public:
+public:
     PreprocessedEntity();
     MacroLocation macroLocation;
     void* originalPtr;
     DeclarationKind kind;
-    };
+};
 
-    class CS_API MacroDefinition : public PreprocessedEntity
+class CS_API MacroDefinition : public PreprocessedEntity
-    {
+{
-    public:
+public:
     MacroDefinition();
     ~MacroDefinition();
     std::string name;
     std::string expression;
     int lineNumberStart;
     int lineNumberEnd;
-    };
+};
 
-    class CS_API MacroExpansion : public PreprocessedEntity
+class CS_API MacroExpansion : public PreprocessedEntity
-    {
+{
-    public:
+public:
     MacroExpansion();
     ~MacroExpansion();
     std::string name;
     std::string text;
     MacroDefinition* definition;
-    };
+};
 
-    class CS_API TranslationUnit : public Namespace
+class CS_API TranslationUnit : public Namespace
-    {
+{
-    public:
+public:
     TranslationUnit();
-        ~TranslationUnit();
+
     std::string fileName;
     bool isSystemHeader;
     VECTOR(MacroDefinition*, Macros)
-    };
+};
 
-    class CS_API ASTContext
+class CS_API ASTContext
-    {
+{
-    public:
+public:
     ASTContext();
     ~ASTContext();
     TranslationUnit* FindOrCreateModule(const std::string& File);
     VECTOR(TranslationUnit*, TranslationUnits)
-    };
+};
-
-}
-}
 } // namespace CppSharp::CppParser::AST