From 711baf495024b90900cbd344a79f8193c3ecb774 Mon Sep 17 00:00:00 2001 From: Krystian Stasiowski Date: Wed, 14 Jun 2023 05:34:59 -0400 Subject: [PATCH] chore: rename VarInfo to VariableInfo --- include/mrdox/Corpus.hpp | 6 +++--- include/mrdox/Metadata.hpp | 2 +- include/mrdox/Metadata/Info.hpp | 2 +- include/mrdox/Metadata/Interface.hpp | 2 +- include/mrdox/Metadata/Record.hpp | 2 +- include/mrdox/Metadata/{Var.hpp => Variable.hpp} | 10 +++++----- include/mrdox/MetadataFwd.hpp | 2 +- source/-XML/CXXTags.hpp | 8 ++++---- source/-XML/XMLWriter.cpp | 4 ++-- source/-XML/XMLWriter.hpp | 4 ++-- source/-adoc/AdocMultiPageWriter.cpp | 2 +- source/-adoc/AdocMultiPageWriter.hpp | 2 +- source/-adoc/AdocSinglePageWriter.cpp | 4 ++-- source/-adoc/AdocSinglePageWriter.hpp | 2 +- source/-adoc/AdocWriter.cpp | 2 +- source/-adoc/AdocWriter.hpp | 2 +- source/AST/ASTVisitor.cpp | 4 ++-- source/AST/ASTVisitor.hpp | 2 +- source/AST/AnyBlock.hpp | 2 +- source/AST/BitcodeWriter.cpp | 6 +++--- source/AST/BitcodeWriter.hpp | 2 +- source/Metadata/Interface.cpp | 4 ++-- source/Metadata/Reduce.cpp | 2 +- source/Metadata/Reduce.hpp | 2 +- source/Tool/Corpus.cpp | 4 ++-- source/Tool/CorpusImpl.cpp | 2 +- 26 files changed, 43 insertions(+), 43 deletions(-) rename include/mrdox/Metadata/{Var.hpp => Variable.hpp} (92%) diff --git a/include/mrdox/Corpus.hpp b/include/mrdox/Corpus.hpp index cdf3fbd55..ec80add4a 100644 --- a/include/mrdox/Corpus.hpp +++ b/include/mrdox/Corpus.hpp @@ -101,7 +101,7 @@ class MRDOX_VISIBLE MRDOX_DECL virtual bool visit(FunctionInfo const&); MRDOX_DECL virtual bool visit(TypedefInfo const&); MRDOX_DECL virtual bool visit(EnumInfo const&); - MRDOX_DECL virtual bool visit(VarInfo const&); + MRDOX_DECL virtual bool visit(VariableInfo const&); MRDOX_DECL virtual bool visit(FieldInfo const&); MRDOX_DECL virtual bool visit(SpecializationInfo const&); }; @@ -180,8 +180,8 @@ visit( return; case InfoKind::Variable: if constexpr(std::is_invocable_v) - f(static_cast(I), + VariableInfo const&, Args&&...>) + f(static_cast(I), std::forward(args)...); return; case InfoKind::Specialization: diff --git a/include/mrdox/Metadata.hpp b/include/mrdox/Metadata.hpp index 270b8fbfa..5ae2abbc7 100644 --- a/include/mrdox/Metadata.hpp +++ b/include/mrdox/Metadata.hpp @@ -33,6 +33,6 @@ #include #include #include -#include +#include #endif diff --git a/include/mrdox/Metadata/Info.hpp b/include/mrdox/Metadata/Info.hpp index b18002412..e6833956d 100644 --- a/include/mrdox/Metadata/Info.hpp +++ b/include/mrdox/Metadata/Info.hpp @@ -29,7 +29,7 @@ struct RecordInfo; struct FunctionInfo; struct EnumInfo; struct TypedefInfo; -struct VarInfo; +struct VariableInfo; struct SpecializationInfo; /** Common properties of all symbols diff --git a/include/mrdox/Metadata/Interface.hpp b/include/mrdox/Metadata/Interface.hpp index 6f971ae45..bf1e10a3e 100644 --- a/include/mrdox/Metadata/Interface.hpp +++ b/include/mrdox/Metadata/Interface.hpp @@ -54,7 +54,7 @@ struct MemberType struct StaticDataMember { - VarInfo const* I; + VariableInfo const* I; RecordInfo const* From; }; diff --git a/include/mrdox/Metadata/Record.hpp b/include/mrdox/Metadata/Record.hpp index f072ca4bc..13440a85b 100644 --- a/include/mrdox/Metadata/Record.hpp +++ b/include/mrdox/Metadata/Record.hpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/mrdox/Metadata/Var.hpp b/include/mrdox/Metadata/Variable.hpp similarity index 92% rename from include/mrdox/Metadata/Var.hpp rename to include/mrdox/Metadata/Variable.hpp index 8c54494e0..c7119fca5 100644 --- a/include/mrdox/Metadata/Var.hpp +++ b/include/mrdox/Metadata/Variable.hpp @@ -23,7 +23,7 @@ namespace clang { namespace mrdox { -union VarFlags0 +union VariableFlags0 { BitFieldFullValue raw; @@ -35,7 +35,7 @@ union VarFlags0 This includes variables at namespace scope, and static variables at class scope. */ -struct VarInfo +struct VariableInfo : IsInfo , SymbolInfo { @@ -44,14 +44,14 @@ struct VarInfo /** The type of the variable */ TypeInfo Type; - VarFlags0 specs{.raw={0}}; + VariableFlags0 specs{.raw={0}}; std::unique_ptr Template; //-------------------------------------------- explicit - VarInfo( + VariableInfo( SymbolID ID = SymbolID::zero) : IsInfo(ID) { @@ -59,7 +59,7 @@ struct VarInfo private: explicit - VarInfo( + VariableInfo( std::unique_ptr&& T) : Template(std::move(T)) { diff --git a/include/mrdox/MetadataFwd.hpp b/include/mrdox/MetadataFwd.hpp index 5f02d6970..92ad0e3da 100644 --- a/include/mrdox/MetadataFwd.hpp +++ b/include/mrdox/MetadataFwd.hpp @@ -44,7 +44,7 @@ struct SpecializedMember; struct SymbolInfo; struct TypeInfo; struct TypedefInfo; -struct VarInfo; +struct VariableInfo; struct VerbatimBlock; struct TemplateInfo; diff --git a/source/-XML/CXXTags.hpp b/source/-XML/CXXTags.hpp index 8c54bf299..45d2c04bb 100644 --- a/source/-XML/CXXTags.hpp +++ b/source/-XML/CXXTags.hpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include /* @@ -229,10 +229,10 @@ inline void write(FieldFlags const& bits, XMLTags& tags) } -inline void write(VarFlags0 const& bits, XMLTags& tags) +inline void write(VariableFlags0 const& bits, XMLTags& tags) { - BitFieldWriter fw(bits, tags); - fw.write(&VarFlags0::storageClass, "storage-class"); + BitFieldWriter fw(bits, tags); + fw.write(&VariableFlags0::storageClass, "storage-class"); } inline void writeReturnType(TypeInfo const& I, XMLTags& tags) diff --git a/source/-XML/XMLWriter.cpp b/source/-XML/XMLWriter.cpp index 275c30abe..81547fe50 100644 --- a/source/-XML/XMLWriter.cpp +++ b/source/-XML/XMLWriter.cpp @@ -256,7 +256,7 @@ visit( bool XMLWriter:: visit( - VarInfo const& I) + VariableInfo const& I) { return writeVar(I); } @@ -444,7 +444,7 @@ writeField( bool XMLWriter:: writeVar( - VarInfo const& I) + VariableInfo const& I) { openTemplate(I.Template); diff --git a/source/-XML/XMLWriter.hpp b/source/-XML/XMLWriter.hpp index 5030ca479..efb262690 100644 --- a/source/-XML/XMLWriter.hpp +++ b/source/-XML/XMLWriter.hpp @@ -63,7 +63,7 @@ class XMLWriter bool visit(FunctionInfo const&) override; bool visit(TypedefInfo const&) override; bool visit(EnumInfo const&) override; - bool visit(VarInfo const&) override; + bool visit(VariableInfo const&) override; bool visit(SpecializationInfo const&) override; bool visit(FieldInfo const&) override; @@ -72,7 +72,7 @@ class XMLWriter bool writeRecord(RecordInfo const&); bool writeTypedef(TypedefInfo const&); bool writeField(FieldInfo const&); - bool writeVar(VarInfo const&); + bool writeVar(VariableInfo const&); bool writeSpecialization(const SpecializationInfo&); void writeSymbol(SymbolInfo const& I); diff --git a/source/-adoc/AdocMultiPageWriter.cpp b/source/-adoc/AdocMultiPageWriter.cpp index 3e793d679..1d5e04bf5 100644 --- a/source/-adoc/AdocMultiPageWriter.cpp +++ b/source/-adoc/AdocMultiPageWriter.cpp @@ -69,7 +69,7 @@ build( void AdocMultiPageWriter:: build( - VarInfo const& I) + VariableInfo const& I) { } diff --git a/source/-adoc/AdocMultiPageWriter.hpp b/source/-adoc/AdocMultiPageWriter.hpp index cb65ac96d..d459c2bb1 100644 --- a/source/-adoc/AdocMultiPageWriter.hpp +++ b/source/-adoc/AdocMultiPageWriter.hpp @@ -35,7 +35,7 @@ class AdocMultiPageWriter void build(FunctionInfo const&); void build(TypedefInfo const&); void build(EnumInfo const&); - void build(VarInfo const&); + void build(VariableInfo const&); void build(OverloadInfo const&); diff --git a/source/-adoc/AdocSinglePageWriter.cpp b/source/-adoc/AdocSinglePageWriter.cpp index b9d0a2090..ac1e4f53a 100644 --- a/source/-adoc/AdocSinglePageWriter.cpp +++ b/source/-adoc/AdocSinglePageWriter.cpp @@ -91,7 +91,7 @@ visit( auto functionOverloads = makeNamespaceOverloads(I, corpus_); auto typedefList = buildSortedList(I.Members); auto enumList = buildSortedList(I.Members); - auto variableList = buildSortedList(I.Members); + auto variableList = buildSortedList(I.Members); // don't emit empty namespaces, // but still visit child namespaces. @@ -272,7 +272,7 @@ visit( bool AdocSinglePageWriter:: visit( - VarInfo const&) + VariableInfo const&) { return true; } diff --git a/source/-adoc/AdocSinglePageWriter.hpp b/source/-adoc/AdocSinglePageWriter.hpp index a1946ca97..f71a86860 100644 --- a/source/-adoc/AdocSinglePageWriter.hpp +++ b/source/-adoc/AdocSinglePageWriter.hpp @@ -47,7 +47,7 @@ class AdocSinglePageWriter bool visit(FunctionInfo const&) override; bool visit(TypedefInfo const&) override; bool visit(EnumInfo const&) override; - bool visit(VarInfo const&) override; + bool visit(VariableInfo const&) override; //bool visitOverloads(Info const& P, OverloadInfo const&); }; diff --git a/source/-adoc/AdocWriter.cpp b/source/-adoc/AdocWriter.cpp index a5cccdcb5..7e9bfa9da 100644 --- a/source/-adoc/AdocWriter.cpp +++ b/source/-adoc/AdocWriter.cpp @@ -417,7 +417,7 @@ write( void AdocWriter:: write( - VarInfo const& I) + VariableInfo const& I) { } diff --git a/source/-adoc/AdocWriter.hpp b/source/-adoc/AdocWriter.hpp index ed8bb23e5..b1487a6dd 100644 --- a/source/-adoc/AdocWriter.hpp +++ b/source/-adoc/AdocWriter.hpp @@ -71,7 +71,7 @@ class AdocWriter void write(FunctionInfo const& I); void write(TypedefInfo const& I); void write(EnumInfo const& I); - void write(VarInfo const& I); + void write(VariableInfo const& I); virtual llvm::StringRef linkFor(Info const&); virtual llvm::StringRef linkFor(Info const&, OverloadInfo const&); diff --git a/source/AST/ASTVisitor.cpp b/source/AST/ASTVisitor.cpp index 766fa28e6..152b192da 100644 --- a/source/AST/ASTVisitor.cpp +++ b/source/AST/ASTVisitor.cpp @@ -1062,7 +1062,7 @@ buildField( void ASTVisitor:: buildVar( - VarInfo& I, + VariableInfo& I, VarDecl* D) { if(! extractInfo(I, D)) @@ -1230,7 +1230,7 @@ Traverse( MRDOX_ASSERT(! D->getDeclContext()->isRecord() || A != AccessSpecifier::AS_none); - VarInfo I(std::move(Template)); + VariableInfo I(std::move(Template)); I.Access = getAccessFromSpecifier(A); buildVar(I, D); diff --git a/source/AST/ASTVisitor.hpp b/source/AST/ASTVisitor.hpp index 20101d20d..d3f06734a 100644 --- a/source/AST/ASTVisitor.hpp +++ b/source/AST/ASTVisitor.hpp @@ -218,7 +218,7 @@ class ASTVisitor FieldDecl* D); void buildVar( - VarInfo& I, + VariableInfo& I, VarDecl* D); template diff --git a/source/AST/AnyBlock.hpp b/source/AST/AnyBlock.hpp index 4d6a1725c..dc9e79018 100644 --- a/source/AST/AnyBlock.hpp +++ b/source/AST/AnyBlock.hpp @@ -990,7 +990,7 @@ class EnumBlock //------------------------------------------------ class VarBlock - : public TopLevelBlock + : public TopLevelBlock { public: diff --git a/source/AST/BitcodeWriter.cpp b/source/AST/BitcodeWriter.cpp index 57b77e95c..c04d7006c 100644 --- a/source/AST/BitcodeWriter.cpp +++ b/source/AST/BitcodeWriter.cpp @@ -357,7 +357,7 @@ RecordsByBlock{ // TypedefInfo {BI_TYPEDEF_BLOCK_ID, {TYPEDEF_IS_USING}}, - // VarInfo + // VariableInfo {BI_VARIABLE_BLOCK_ID, {VARIABLE_BITS}} }; @@ -395,7 +395,7 @@ dispatchInfoForWrite(Info const* I) emitBlock(*static_cast(I)); break; case InfoKind::Variable: - emitBlock(*static_cast(I)); + emitBlock(*static_cast(I)); break; case InfoKind::Field: emitBlock(*static_cast(I)); @@ -1064,7 +1064,7 @@ emitBlock( void BitcodeWriter:: emitBlock( - VarInfo const& I) + VariableInfo const& I) { StreamSubBlockGuard Block(Stream, BI_VARIABLE_BLOCK_ID); emitInfoPart(I); diff --git a/source/AST/BitcodeWriter.hpp b/source/AST/BitcodeWriter.hpp index 336b3e0d9..4da642bf3 100644 --- a/source/AST/BitcodeWriter.hpp +++ b/source/AST/BitcodeWriter.hpp @@ -132,7 +132,7 @@ class BitcodeWriter void emitBlock(TArg const& T); void emitBlock(TypedefInfo const& I); void emitBlock(TypeInfo const& I); - void emitBlock(VarInfo const& I); + void emitBlock(VariableInfo const& I); void emitBlock(FieldInfo const& I); //-------------------------------------------- diff --git a/source/Metadata/Interface.cpp b/source/Metadata/Interface.cpp index 691a4257f..68fcdd14d 100644 --- a/source/Metadata/Interface.cpp +++ b/source/Metadata/Interface.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include namespace clang { @@ -125,7 +125,7 @@ class Interface::Build break; case InfoKind::Variable: vars_.push_back({ actualAccess, - { static_cast(&I), &From } }); + { static_cast(&I), &From } }); break; default: diff --git a/source/Metadata/Reduce.cpp b/source/Metadata/Reduce.cpp index ed7e7eddf..b04d41b54 100644 --- a/source/Metadata/Reduce.cpp +++ b/source/Metadata/Reduce.cpp @@ -222,7 +222,7 @@ void merge(FieldInfo& I, FieldInfo&& Other) I.Default = std::move(Other.Default); } -void merge(VarInfo& I, VarInfo&& Other) +void merge(VariableInfo& I, VariableInfo&& Other) { MRDOX_ASSERT(canMerge(I, Other)); if(I.Type.id == SymbolID::zero && I.Type.Name.empty()) diff --git a/source/Metadata/Reduce.hpp b/source/Metadata/Reduce.hpp index 6135b917f..9c43e21dd 100644 --- a/source/Metadata/Reduce.hpp +++ b/source/Metadata/Reduce.hpp @@ -27,7 +27,7 @@ void merge(FunctionInfo& I, FunctionInfo&& Other); void merge(TypedefInfo& I, TypedefInfo&& Other); void merge(EnumInfo& I, EnumInfo&& Other); void merge(FieldInfo& I, FieldInfo&& Other); -void merge(VarInfo& I, VarInfo&& Other); +void merge(VariableInfo& I, VariableInfo&& Other); void merge(SpecializationInfo& I, SpecializationInfo&& Other); // diff --git a/source/Tool/Corpus.cpp b/source/Tool/Corpus.cpp index 2af99801f..3c9118e81 100644 --- a/source/Tool/Corpus.cpp +++ b/source/Tool/Corpus.cpp @@ -68,7 +68,7 @@ bool Corpus::Visitor::visit(EnumInfo const&) return true; } -bool Corpus::Visitor::visit(VarInfo const&) +bool Corpus::Visitor::visit(VariableInfo const&) { return true; } @@ -104,7 +104,7 @@ traverse( case InfoKind::Enum: return f.visit(static_cast(I)); case InfoKind::Variable: - return f.visit(static_cast(I)); + return f.visit(static_cast(I)); case InfoKind::Field: return f.visit(static_cast(I)); case InfoKind::Specialization: diff --git a/source/Tool/CorpusImpl.cpp b/source/Tool/CorpusImpl.cpp index a1f0b6441..70824831b 100644 --- a/source/Tool/CorpusImpl.cpp +++ b/source/Tool/CorpusImpl.cpp @@ -45,7 +45,7 @@ mergeInfos(std::vector>& Values) case InfoKind::Typedef: return reduce(Values); case InfoKind::Variable: - return reduce(Values); + return reduce(Values); case InfoKind::Field: return reduce(Values); case InfoKind::Specialization: