Skip to content

Commit 9ce1795

Browse files
nkcsgexinkcsgexi
authored
Merge pull request #24192 from nkcsgexi/build-rename-5.1
[5.1] syntax: perform rename to avoid name collision in syntax builder. NFC
2 parents 618f111 + d824ac9 commit 9ce1795

File tree

6 files changed

+27
-25
lines changed

6 files changed

+27
-25
lines changed

‎include/swift/Syntax/SyntaxBuilders.h.gyb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ public:
5050
% if child_node and child_node.is_syntax_collection():
5151
% child_elt = child_node.collection_element_name
5252
% child_elt_type = child_node.collection_element_type
53-
${node.name}Builder &add${child_elt}(${child_elt_type} ${child_elt});
53+
% child_elt_name = child.name + 'Member'
54+
${node.name}Builder &add${child_elt_name}(${child_elt_type} ${child_elt});
5455
% end
5556
% end
5657

‎lib/Syntax/SyntaxBuilders.cpp.gyb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ ${node.name}Builder::use${child.name}(${child.type_name} ${child.name}) {
3838
% if child_node and child_node.is_syntax_collection():
3939
% child_elt = child_node.collection_element_name
4040
% child_elt_type = child_node.collection_element_type
41+
% child_elt_name = child.name + 'Member'
4142
${node.name}Builder &
42-
${node.name}Builder::add${child_elt}(${child_elt_type} ${child_elt}) {
43+
${node.name}Builder::add${child_elt_name}(${child_elt_type} ${child_elt}) {
4344
auto &raw = Layout[cursorIndex(${node.name}::Cursor::${child.name})];
4445
if (!raw)
4546
raw = RawSyntax::make(SyntaxKind::${child_node.syntax_kind},

‎unittests/Syntax/DeclSyntaxTests.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ TEST(DeclSyntaxTests, TypealiasMakeAPIs) {
8888
auto GenericParams = GenericParameterClauseSyntaxBuilder()
8989
.useLeftAngleBracket(LeftAngle)
9090
.useRightAngleBracket(RightAngle)
91-
.addGenericParameter(ElementParam)
91+
.addGenericParameterListMember(ElementParam)
9292
.build();
9393
auto Assignment = SyntaxFactory::makeEqualToken({}, { Trivia::spaces(1) });
9494
auto ElementType = SyntaxFactory::makeTypeIdentifier("Element", {}, {});
@@ -97,7 +97,7 @@ TEST(DeclSyntaxTests, TypealiasMakeAPIs) {
9797
auto GenericArgs = GenericArgumentClauseSyntaxBuilder()
9898
.useLeftAngleBracket(LeftAngle)
9999
.useRightAngleBracket(SyntaxFactory::makeRightAngleToken({}, {}))
100-
.addGenericArgument(ElementArg)
100+
.addArgumentsMember(ElementArg)
101101
.build();
102102

103103
auto Array = SyntaxFactory::makeIdentifier("Array", {}, {});
@@ -126,7 +126,7 @@ TEST(DeclSyntaxTests, TypealiasWithAPIs) {
126126
auto GenericParams = GenericParameterClauseSyntaxBuilder()
127127
.useLeftAngleBracket(LeftAngle)
128128
.useRightAngleBracket(RightAngle)
129-
.addGenericParameter(ElementParam)
129+
.addGenericParameterListMember(ElementParam)
130130
.build();
131131
auto Equal = SyntaxFactory::makeEqualToken({}, { Trivia::spaces(1) });
132132

@@ -135,7 +135,7 @@ TEST(DeclSyntaxTests, TypealiasWithAPIs) {
135135
auto GenericArgs = GenericArgumentClauseSyntaxBuilder()
136136
.useLeftAngleBracket(LeftAngle)
137137
.useRightAngleBracket(SyntaxFactory::makeRightAngleToken({}, {}))
138-
.addGenericArgument(ElementArg)
138+
.addArgumentsMember(ElementArg)
139139
.build();
140140

141141
auto Array = SyntaxFactory::makeIdentifier("Array", {}, {});
@@ -170,7 +170,7 @@ TEST(DeclSyntaxTests, TypealiasBuilderAPIs) {
170170
auto GenericParams = GenericParameterClauseSyntaxBuilder()
171171
.useLeftAngleBracket(LeftAngle)
172172
.useRightAngleBracket(RightAngle)
173-
.addGenericParameter(ElementParam)
173+
.addGenericParameterListMember(ElementParam)
174174
.build();
175175
auto Equal =
176176
SyntaxFactory::makeEqualToken({}, { Trivia::spaces(1) });
@@ -181,7 +181,7 @@ TEST(DeclSyntaxTests, TypealiasBuilderAPIs) {
181181
auto GenericArgs = GenericArgumentClauseSyntaxBuilder()
182182
.useLeftAngleBracket(LeftAngle)
183183
.useRightAngleBracket(SyntaxFactory::makeRightAngleToken({}, {}))
184-
.addGenericArgument(ElementArg)
184+
.addArgumentsMember(ElementArg)
185185
.build();
186186

187187
auto Array = SyntaxFactory::makeIdentifier("Array", {}, {});
@@ -519,8 +519,8 @@ GenericParameterClauseSyntax getCannedGenericParams() {
519519
auto T = SyntaxFactory::makeGenericParameter(TType, Comma);
520520
auto U = SyntaxFactory::makeGenericParameter(UType, None);
521521

522-
GB.addGenericParameter(T);
523-
GB.addGenericParameter(U);
522+
GB.addGenericParameterListMember(T);
523+
GB.addGenericParameterListMember(U);
524524
GB.useLeftAngleBracket(LAngle);
525525
GB.useRightAngleBracket(RAngle);
526526

‎unittests/Syntax/ExprSyntaxTests.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ TEST(ExprSyntaxTests, SymbolicReferenceExprGetAPIs) {
6868
ArgBuilder
6969
.useLeftAngleBracket(SyntaxFactory::makeLeftAngleToken({}, {}))
7070
.useRightAngleBracket(SyntaxFactory::makeRightAngleToken({}, {}))
71-
.addGenericArgument(GenericArg);
71+
.addArgumentsMember(GenericArg);
7272

7373
auto GenericArgs = ArgBuilder.build();
7474

@@ -98,7 +98,7 @@ TEST(ExprSyntaxTests, SymbolicReferenceExprMakeAPIs) {
9898
ArgBuilder
9999
.useLeftAngleBracket(SyntaxFactory::makeLeftAngleToken({}, {}))
100100
.useRightAngleBracket(SyntaxFactory::makeRightAngleToken({}, {}))
101-
.addGenericArgument(GenericArg);
101+
.addArgumentsMember(GenericArg);
102102
auto GenericArgs = ArgBuilder.build();
103103

104104
{
@@ -135,7 +135,7 @@ TEST(ExprSyntaxTests, SymbolicReferenceExprWithAPIs) {
135135
ArgBuilder
136136
.useLeftAngleBracket(SyntaxFactory::makeLeftAngleToken({}, {}))
137137
.useRightAngleBracket(SyntaxFactory::makeRightAngleToken({}, {}))
138-
.addGenericArgument(GenericArg);
138+
.addArgumentsMember(GenericArg);
139139
auto GenericArgs = ArgBuilder.build();
140140

141141
{
@@ -528,15 +528,15 @@ TEST(ExprSyntaxTests, FunctionCallExprBuilderAPIs) {
528528
{
529529
llvm::SmallString<64> Scratch;
530530
llvm::raw_svector_ostream OS(Scratch);
531-
CallBuilder.addFunctionCallArgument(OneArg);
531+
CallBuilder.addArgumentListMember(OneArg);
532532
CallBuilder.build().print(OS);
533533
ASSERT_EQ(OS.str().str(), "foo(1, )");
534534
}
535535

536536
{
537537
llvm::SmallString<64> Scratch;
538538
llvm::raw_svector_ostream OS(Scratch);
539-
CallBuilder.addFunctionCallArgument(OneArg.withTrailingComma(NoComma));
539+
CallBuilder.addArgumentListMember(OneArg.withTrailingComma(NoComma));
540540
CallBuilder.build().print(OS);
541541
ASSERT_EQ(OS.str().str(), "foo(1, 1)");
542542
}

‎unittests/Syntax/TypeSyntaxTests.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,9 @@ TEST(TypeSyntaxTests, TupleBuilderAPIs) {
202202
auto StringId = SyntaxFactory::makeIdentifier("String", {}, {});
203203
auto StringType = SyntaxFactory::makeSimpleTypeIdentifier(StringId, None);
204204
auto String = SyntaxFactory::makeTupleTypeElement(StringType, Comma);
205-
Builder.addTupleTypeElement(IntWithComma);
206-
Builder.addTupleTypeElement(String);
207-
Builder.addTupleTypeElement(Int);
205+
Builder.addElementsMember(IntWithComma);
206+
Builder.addElementsMember(String);
207+
Builder.addElementsMember(Int);
208208
Builder.useRightParen(SyntaxFactory::makeRightParenToken({}, {}));
209209

210210
auto TupleType = Builder.build();
@@ -229,8 +229,8 @@ TEST(TypeSyntaxTests, TupleBuilderAPIs) {
229229
auto yTypeElt = SyntaxFactory::makeTupleTypeElement(yLabel, Colon,
230230
Int)
231231
.withInOut(inout);
232-
Builder.addTupleTypeElement(xTypeElt);
233-
Builder.addTupleTypeElement(yTypeElt);
232+
Builder.addElementsMember(xTypeElt);
233+
Builder.addElementsMember(yTypeElt);
234234
Builder.useRightParen(SyntaxFactory::makeRightParenToken({}, {}));
235235

236236
auto TupleType = Builder.build();
@@ -628,8 +628,8 @@ TEST(TypeSyntaxTests, FunctionTypeBuilderAPIs) {
628628

629629
Builder.useLeftParen(LeftParen)
630630
.useRightParen(RightParen)
631-
.addTupleTypeElement(xArg)
632-
.addTupleTypeElement(yArg)
631+
.addArgumentsMember(xArg)
632+
.addArgumentsMember(yArg)
633633
.useThrowsOrRethrowsKeyword(Throws)
634634
.useArrow(Arrow)
635635
.useReturnType(Int);
@@ -646,8 +646,8 @@ TEST(TypeSyntaxTests, FunctionTypeBuilderAPIs) {
646646
Int, None, None, None);
647647
Builder.useLeftParen(LeftParen)
648648
.useRightParen(RightParen)
649-
.addTupleTypeElement(IntArg.withTrailingComma(Comma))
650-
.addTupleTypeElement(IntArg)
649+
.addArgumentsMember(IntArg.withTrailingComma(Comma))
650+
.addArgumentsMember(IntArg)
651651
.useThrowsOrRethrowsKeyword(Rethrows)
652652
.useArrow(Arrow)
653653
.useReturnType(Int);

‎unittests/Syntax/UnknownSyntaxTests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ SymbolicReferenceExprSyntax getCannedSymbolicRef() {
2020
ArgBuilder
2121
.useLeftAngleBracket(SyntaxFactory::makeLeftAngleToken({}, {}))
2222
.useRightAngleBracket(SyntaxFactory::makeRightAngleToken({}, {}))
23-
.addGenericArgument(IntArg);
23+
.addArgumentsMember(IntArg);
2424
2525
return SyntaxFactory::makeSymbolicReferenceExpr(Array, ArgBuilder.build());
2626
}

0 commit comments

Comments
 (0)