chore: rename VarInfo to VariableInfo

cppalliance · Jun 14, 2023 · 711baf4 · 711baf4
1 parent d9ad26f
commit 711baf4
Show file tree

Hide file tree

Showing 26 changed files with 43 additions and 43 deletions.
diff --git 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,
-                VarInfo const&, Args&&...>)
-            f(static_cast<VarInfo const&>(I),
+                VariableInfo const&, Args&&...>)
+            f(static_cast<VariableInfo const&>(I),
                 std::forward<Args>(args)...);
         return;
     case InfoKind::Specialization:

diff --git a/include/mrdox/Metadata.hpp b/include/mrdox/Metadata.hpp
@@ -33,6 +33,6 @@
 #include <mrdox/Metadata/Template.hpp>
 #include <mrdox/Metadata/Type.hpp>
 #include <mrdox/Metadata/Typedef.hpp>
-#include <mrdox/Metadata/Var.hpp>
+#include <mrdox/Metadata/Variable.hpp>
 
 #endif
diff --git 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
@@ -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
@@ -21,7 +21,7 @@
 #include <mrdox/Metadata/Symbols.hpp>
 #include <mrdox/Metadata/Template.hpp>
 #include <mrdox/Metadata/Typedef.hpp>
-#include <mrdox/Metadata/Var.hpp>
+#include <mrdox/Metadata/Variable.hpp>
 #include <memory>
 #include <string>
 #include <string_view>

diff --git a/include/mrdox/Metadata/Var.hpp → include/mrdox/Metadata/Variable.hpp b/include/mrdox/Metadata/Var.hpp → 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<InfoKind::Variable>
     , SymbolInfo
 {
@@ -44,22 +44,22 @@ struct VarInfo
     /** The type of the variable */
     TypeInfo Type;
 
-    VarFlags0 specs{.raw={0}};
+    VariableFlags0 specs{.raw={0}};
 
     std::unique_ptr<TemplateInfo> Template;
 
     //--------------------------------------------
 
     explicit
-    VarInfo(
+    VariableInfo(
         SymbolID ID = SymbolID::zero)
         : IsInfo(ID)
     {
     }
 
 private:
     explicit
-    VarInfo(
+    VariableInfo(
         std::unique_ptr<TemplateInfo>&& T)
         : Template(std::move(T))
     {

diff --git 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
@@ -18,7 +18,7 @@
 #include <mrdox/Metadata/Function.hpp>
 #include <mrdox/Metadata/Record.hpp>
 #include <mrdox/Metadata/Type.hpp>
-#include <mrdox/Metadata/Var.hpp>
+#include <mrdox/Metadata/Variable.hpp>
 #include <mrdox/Platform.hpp>
 
 /*
@@ -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<VarFlags0> fw(bits, tags);
-    fw.write(&VarFlags0::storageClass, "storage-class");
+    BitFieldWriter<VariableFlags0> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -91,7 +91,7 @@ visit(
     auto functionOverloads = makeNamespaceOverloads(I, corpus_);
     auto typedefList       = buildSortedList<TypedefInfo>(I.Members);
     auto enumList          = buildSortedList<EnumInfo>(I.Members);
-    auto variableList      = buildSortedList<VarInfo>(I.Members);
+    auto variableList      = buildSortedList<VariableInfo>(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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -218,7 +218,7 @@ class ASTVisitor
         FieldDecl* D);
 
     void buildVar(
-        VarInfo& I,
+        VariableInfo& I,
         VarDecl* D);
 
     template<class DeclTy>

diff --git a/source/AST/AnyBlock.hpp b/source/AST/AnyBlock.hpp
@@ -990,7 +990,7 @@ class EnumBlock
 //------------------------------------------------
 
 class VarBlock
-    : public TopLevelBlock<VarInfo>
+    : public TopLevelBlock<VariableInfo>
 {
 
 public:

diff --git 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<TypedefInfo const*>(I));
         break;
     case InfoKind::Variable:
-        emitBlock(*static_cast<VarInfo const*>(I));
+        emitBlock(*static_cast<VariableInfo const*>(I));
         break;
     case InfoKind::Field:
         emitBlock(*static_cast<FieldInfo const*>(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
@@ -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
@@ -18,7 +18,7 @@
 #include <mrdox/Metadata/Function.hpp>
 #include <mrdox/Metadata/Record.hpp>
 #include <mrdox/Metadata/Typedef.hpp>
-#include <mrdox/Metadata/Var.hpp>
+#include <mrdox/Metadata/Variable.hpp>
 #include <algorithm>
 
 namespace clang {
@@ -125,7 +125,7 @@ class Interface::Build
                     break;
                 case InfoKind::Variable:
                     vars_.push_back({ actualAccess,
-                        { static_cast<const VarInfo*>(&I), &From } });
+                        { static_cast<const VariableInfo*>(&I), &From } });
                     break;
 
                 default:

diff --git 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
@@ -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
@@ -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<EnumInfo const&>(I));
     case InfoKind::Variable:
-        return f.visit(static_cast<VarInfo const&>(I));
+        return f.visit(static_cast<VariableInfo const&>(I));
     case InfoKind::Field:
         return f.visit(static_cast<FieldInfo const&>(I));
     case InfoKind::Specialization:

diff --git a/source/Tool/CorpusImpl.cpp b/source/Tool/CorpusImpl.cpp
@@ -45,7 +45,7 @@ mergeInfos(std::vector<std::unique_ptr<Info>>& Values)
     case InfoKind::Typedef:
         return reduce<TypedefInfo>(Values);
     case InfoKind::Variable:
-        return reduce<VarInfo>(Values);
+        return reduce<VariableInfo>(Values);
     case InfoKind::Field:
         return reduce<FieldInfo>(Values);
     case InfoKind::Specialization:
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,7 +69,7 @@ build( @@
     void
     AdocMultiPageWriter::
     build(
-        VarInfo const& I)
+        VariableInfo const& I)
     {
     }
@@ Expand Down @@