Skip to content

Commit 711baf4

Browse files
sdkrystiansdkrystian
committed
chore: rename VarInfo to VariableInfo
1 parent d9ad26f commit 711baf4

26 files changed

+43
-43
lines changed

‎include/mrdox/Corpus.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class MRDOX_VISIBLE
101101
MRDOX_DECL virtual bool visit(FunctionInfo const&);
102102
MRDOX_DECL virtual bool visit(TypedefInfo const&);
103103
MRDOX_DECL virtual bool visit(EnumInfo const&);
104-
MRDOX_DECL virtual bool visit(VarInfo const&);
104+
MRDOX_DECL virtual bool visit(VariableInfo const&);
105105
MRDOX_DECL virtual bool visit(FieldInfo const&);
106106
MRDOX_DECL virtual bool visit(SpecializationInfo const&);
107107
};
@@ -180,8 +180,8 @@ visit(
180180
return;
181181
case InfoKind::Variable:
182182
if constexpr(std::is_invocable_v<F,
183-
VarInfo const&, Args&&...>)
184-
f(static_cast<VarInfo const&>(I),
183+
VariableInfo const&, Args&&...>)
184+
f(static_cast<VariableInfo const&>(I),
185185
std::forward<Args>(args)...);
186186
return;
187187
case InfoKind::Specialization:

‎include/mrdox/Metadata.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@
3333
#include <mrdox/Metadata/Template.hpp>
3434
#include <mrdox/Metadata/Type.hpp>
3535
#include <mrdox/Metadata/Typedef.hpp>
36-
#include <mrdox/Metadata/Var.hpp>
36+
#include <mrdox/Metadata/Variable.hpp>
3737

3838
#endif

‎include/mrdox/Metadata/Info.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ struct RecordInfo;
2929
struct FunctionInfo;
3030
struct EnumInfo;
3131
struct TypedefInfo;
32-
struct VarInfo;
32+
struct VariableInfo;
3333
struct SpecializationInfo;
3434

3535
/** Common properties of all symbols

‎include/mrdox/Metadata/Interface.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ struct MemberType
5454

5555
struct StaticDataMember
5656
{
57-
VarInfo const* I;
57+
VariableInfo const* I;
5858
RecordInfo const* From;
5959
};
6060

‎include/mrdox/Metadata/Record.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <mrdox/Metadata/Symbols.hpp>
2222
#include <mrdox/Metadata/Template.hpp>
2323
#include <mrdox/Metadata/Typedef.hpp>
24-
#include <mrdox/Metadata/Var.hpp>
24+
#include <mrdox/Metadata/Variable.hpp>
2525
#include <memory>
2626
#include <string>
2727
#include <string_view>

‎include/mrdox/Metadata/Var.hpp ‎include/mrdox/Metadata/Variable.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
namespace clang {
2424
namespace mrdox {
2525

26-
union VarFlags0
26+
union VariableFlags0
2727
{
2828
BitFieldFullValue raw;
2929

@@ -35,7 +35,7 @@ union VarFlags0
3535
This includes variables at namespace
3636
scope, and static variables at class scope.
3737
*/
38-
struct VarInfo
38+
struct VariableInfo
3939
: IsInfo<InfoKind::Variable>
4040
, SymbolInfo
4141
{
@@ -44,22 +44,22 @@ struct VarInfo
4444
/** The type of the variable */
4545
TypeInfo Type;
4646

47-
VarFlags0 specs{.raw={0}};
47+
VariableFlags0 specs{.raw={0}};
4848

4949
std::unique_ptr<TemplateInfo> Template;
5050

5151
//--------------------------------------------
5252

5353
explicit
54-
VarInfo(
54+
VariableInfo(
5555
SymbolID ID = SymbolID::zero)
5656
: IsInfo(ID)
5757
{
5858
}
5959

6060
private:
6161
explicit
62-
VarInfo(
62+
VariableInfo(
6363
std::unique_ptr<TemplateInfo>&& T)
6464
: Template(std::move(T))
6565
{

‎include/mrdox/MetadataFwd.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ struct SpecializedMember;
4444
struct SymbolInfo;
4545
struct TypeInfo;
4646
struct TypedefInfo;
47-
struct VarInfo;
47+
struct VariableInfo;
4848
struct VerbatimBlock;
4949

5050
struct TemplateInfo;

‎source/-XML/CXXTags.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <mrdox/Metadata/Function.hpp>
1919
#include <mrdox/Metadata/Record.hpp>
2020
#include <mrdox/Metadata/Type.hpp>
21-
#include <mrdox/Metadata/Var.hpp>
21+
#include <mrdox/Metadata/Variable.hpp>
2222
#include <mrdox/Platform.hpp>
2323

2424
/*
@@ -229,10 +229,10 @@ inline void write(FieldFlags const& bits, XMLTags& tags)
229229
}
230230

231231

232-
inline void write(VarFlags0 const& bits, XMLTags& tags)
232+
inline void write(VariableFlags0 const& bits, XMLTags& tags)
233233
{
234-
BitFieldWriter<VarFlags0> fw(bits, tags);
235-
fw.write(&VarFlags0::storageClass, "storage-class");
234+
BitFieldWriter<VariableFlags0> fw(bits, tags);
235+
fw.write(&VariableFlags0::storageClass, "storage-class");
236236
}
237237

238238
inline void writeReturnType(TypeInfo const& I, XMLTags& tags)

‎source/-XML/XMLWriter.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ visit(
256256
bool
257257
XMLWriter::
258258
visit(
259-
VarInfo const& I)
259+
VariableInfo const& I)
260260
{
261261
return writeVar(I);
262262
}
@@ -444,7 +444,7 @@ writeField(
444444
bool
445445
XMLWriter::
446446
writeVar(
447-
VarInfo const& I)
447+
VariableInfo const& I)
448448
{
449449
openTemplate(I.Template);
450450

‎source/-XML/XMLWriter.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class XMLWriter
6363
bool visit(FunctionInfo const&) override;
6464
bool visit(TypedefInfo const&) override;
6565
bool visit(EnumInfo const&) override;
66-
bool visit(VarInfo const&) override;
66+
bool visit(VariableInfo const&) override;
6767
bool visit(SpecializationInfo const&) override;
6868
bool visit(FieldInfo const&) override;
6969

@@ -72,7 +72,7 @@ class XMLWriter
7272
bool writeRecord(RecordInfo const&);
7373
bool writeTypedef(TypedefInfo const&);
7474
bool writeField(FieldInfo const&);
75-
bool writeVar(VarInfo const&);
75+
bool writeVar(VariableInfo const&);
7676
bool writeSpecialization(const SpecializationInfo&);
7777

7878
void writeSymbol(SymbolInfo const& I);

‎source/-adoc/AdocMultiPageWriter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ build(
6969
void
7070
AdocMultiPageWriter::
7171
build(
72-
VarInfo const& I)
72+
VariableInfo const& I)
7373
{
7474
}
7575

‎source/-adoc/AdocMultiPageWriter.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class AdocMultiPageWriter
3535
void build(FunctionInfo const&);
3636
void build(TypedefInfo const&);
3737
void build(EnumInfo const&);
38-
void build(VarInfo const&);
38+
void build(VariableInfo const&);
3939

4040
void build(OverloadInfo const&);
4141

‎source/-adoc/AdocSinglePageWriter.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ visit(
9191
auto functionOverloads = makeNamespaceOverloads(I, corpus_);
9292
auto typedefList = buildSortedList<TypedefInfo>(I.Members);
9393
auto enumList = buildSortedList<EnumInfo>(I.Members);
94-
auto variableList = buildSortedList<VarInfo>(I.Members);
94+
auto variableList = buildSortedList<VariableInfo>(I.Members);
9595

9696
// don't emit empty namespaces,
9797
// but still visit child namespaces.
@@ -272,7 +272,7 @@ visit(
272272
bool
273273
AdocSinglePageWriter::
274274
visit(
275-
VarInfo const&)
275+
VariableInfo const&)
276276
{
277277
return true;
278278
}

‎source/-adoc/AdocSinglePageWriter.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class AdocSinglePageWriter
4747
bool visit(FunctionInfo const&) override;
4848
bool visit(TypedefInfo const&) override;
4949
bool visit(EnumInfo const&) override;
50-
bool visit(VarInfo const&) override;
50+
bool visit(VariableInfo const&) override;
5151

5252
//bool visitOverloads(Info const& P, OverloadInfo const&);
5353
};

‎source/-adoc/AdocWriter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ write(
417417
void
418418
AdocWriter::
419419
write(
420-
VarInfo const& I)
420+
VariableInfo const& I)
421421
{
422422
}
423423

‎source/-adoc/AdocWriter.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class AdocWriter
7171
void write(FunctionInfo const& I);
7272
void write(TypedefInfo const& I);
7373
void write(EnumInfo const& I);
74-
void write(VarInfo const& I);
74+
void write(VariableInfo const& I);
7575

7676
virtual llvm::StringRef linkFor(Info const&);
7777
virtual llvm::StringRef linkFor(Info const&, OverloadInfo const&);

‎source/AST/ASTVisitor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1062,7 +1062,7 @@ buildField(
10621062
void
10631063
ASTVisitor::
10641064
buildVar(
1065-
VarInfo& I,
1065+
VariableInfo& I,
10661066
VarDecl* D)
10671067
{
10681068
if(! extractInfo(I, D))
@@ -1230,7 +1230,7 @@ Traverse(
12301230
MRDOX_ASSERT(! D->getDeclContext()->isRecord() ||
12311231
A != AccessSpecifier::AS_none);
12321232

1233-
VarInfo I(std::move(Template));
1233+
VariableInfo I(std::move(Template));
12341234
I.Access = getAccessFromSpecifier(A);
12351235

12361236
buildVar(I, D);

‎source/AST/ASTVisitor.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ class ASTVisitor
218218
FieldDecl* D);
219219

220220
void buildVar(
221-
VarInfo& I,
221+
VariableInfo& I,
222222
VarDecl* D);
223223

224224
template<class DeclTy>

‎source/AST/AnyBlock.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@ class EnumBlock
990990
//------------------------------------------------
991991

992992
class VarBlock
993-
: public TopLevelBlock<VarInfo>
993+
: public TopLevelBlock<VariableInfo>
994994
{
995995

996996
public:

‎source/AST/BitcodeWriter.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ RecordsByBlock{
357357
// TypedefInfo
358358
{BI_TYPEDEF_BLOCK_ID,
359359
{TYPEDEF_IS_USING}},
360-
// VarInfo
360+
// VariableInfo
361361
{BI_VARIABLE_BLOCK_ID, {VARIABLE_BITS}}
362362
};
363363

@@ -395,7 +395,7 @@ dispatchInfoForWrite(Info const* I)
395395
emitBlock(*static_cast<TypedefInfo const*>(I));
396396
break;
397397
case InfoKind::Variable:
398-
emitBlock(*static_cast<VarInfo const*>(I));
398+
emitBlock(*static_cast<VariableInfo const*>(I));
399399
break;
400400
case InfoKind::Field:
401401
emitBlock(*static_cast<FieldInfo const*>(I));
@@ -1064,7 +1064,7 @@ emitBlock(
10641064
void
10651065
BitcodeWriter::
10661066
emitBlock(
1067-
VarInfo const& I)
1067+
VariableInfo const& I)
10681068
{
10691069
StreamSubBlockGuard Block(Stream, BI_VARIABLE_BLOCK_ID);
10701070
emitInfoPart(I);

‎source/AST/BitcodeWriter.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ class BitcodeWriter
132132
void emitBlock(TArg const& T);
133133
void emitBlock(TypedefInfo const& I);
134134
void emitBlock(TypeInfo const& I);
135-
void emitBlock(VarInfo const& I);
135+
void emitBlock(VariableInfo const& I);
136136
void emitBlock(FieldInfo const& I);
137137

138138
//--------------------------------------------

‎source/Metadata/Interface.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <mrdox/Metadata/Function.hpp>
1919
#include <mrdox/Metadata/Record.hpp>
2020
#include <mrdox/Metadata/Typedef.hpp>
21-
#include <mrdox/Metadata/Var.hpp>
21+
#include <mrdox/Metadata/Variable.hpp>
2222
#include <algorithm>
2323

2424
namespace clang {
@@ -125,7 +125,7 @@ class Interface::Build
125125
break;
126126
case InfoKind::Variable:
127127
vars_.push_back({ actualAccess,
128-
{ static_cast<const VarInfo*>(&I), &From } });
128+
{ static_cast<const VariableInfo*>(&I), &From } });
129129
break;
130130

131131
default:

‎source/Metadata/Reduce.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ void merge(FieldInfo& I, FieldInfo&& Other)
222222
I.Default = std::move(Other.Default);
223223
}
224224

225-
void merge(VarInfo& I, VarInfo&& Other)
225+
void merge(VariableInfo& I, VariableInfo&& Other)
226226
{
227227
MRDOX_ASSERT(canMerge(I, Other));
228228
if(I.Type.id == SymbolID::zero && I.Type.Name.empty())

‎source/Metadata/Reduce.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ void merge(FunctionInfo& I, FunctionInfo&& Other);
2727
void merge(TypedefInfo& I, TypedefInfo&& Other);
2828
void merge(EnumInfo& I, EnumInfo&& Other);
2929
void merge(FieldInfo& I, FieldInfo&& Other);
30-
void merge(VarInfo& I, VarInfo&& Other);
30+
void merge(VariableInfo& I, VariableInfo&& Other);
3131
void merge(SpecializationInfo& I, SpecializationInfo&& Other);
3232

3333
//

‎source/Tool/Corpus.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ bool Corpus::Visitor::visit(EnumInfo const&)
6868
return true;
6969
}
7070

71-
bool Corpus::Visitor::visit(VarInfo const&)
71+
bool Corpus::Visitor::visit(VariableInfo const&)
7272
{
7373
return true;
7474
}
@@ -104,7 +104,7 @@ traverse(
104104
case InfoKind::Enum:
105105
return f.visit(static_cast<EnumInfo const&>(I));
106106
case InfoKind::Variable:
107-
return f.visit(static_cast<VarInfo const&>(I));
107+
return f.visit(static_cast<VariableInfo const&>(I));
108108
case InfoKind::Field:
109109
return f.visit(static_cast<FieldInfo const&>(I));
110110
case InfoKind::Specialization:

‎source/Tool/CorpusImpl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ mergeInfos(std::vector<std::unique_ptr<Info>>& Values)
4545
case InfoKind::Typedef:
4646
return reduce<TypedefInfo>(Values);
4747
case InfoKind::Variable:
48-
return reduce<VarInfo>(Values);
48+
return reduce<VariableInfo>(Values);
4949
case InfoKind::Field:
5050
return reduce<FieldInfo>(Values);
5151
case InfoKind::Specialization:

0 commit comments

Comments
 (0)