Skip to content

[5.1] syntax: perform rename to avoid name collision in syntax builder. NFC #24192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 21, 2019
Merged

[5.1] syntax: perform rename to avoid name collision in syntax builder. NFC #24192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/swift/Syntax/SyntaxBuilders.h.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ public:
% if child_node and child_node.is_syntax_collection():
% child_elt = child_node.collection_element_name
% child_elt_type = child_node.collection_element_type
${node.name}Builder &add${child_elt}(${child_elt_type} ${child_elt});
% child_elt_name = child.name + 'Member'
${node.name}Builder &add${child_elt_name}(${child_elt_type} ${child_elt});
% end
% end

Expand Down
3 changes: 2 additions & 1 deletion lib/Syntax/SyntaxBuilders.cpp.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ ${node.name}Builder::use${child.name}(${child.type_name} ${child.name}) {
% if child_node and child_node.is_syntax_collection():
% child_elt = child_node.collection_element_name
% child_elt_type = child_node.collection_element_type
% child_elt_name = child.name + 'Member'
${node.name}Builder &
${node.name}Builder::add${child_elt}(${child_elt_type} ${child_elt}) {
${node.name}Builder::add${child_elt_name}(${child_elt_type} ${child_elt}) {
auto &raw = Layout[cursorIndex(${node.name}::Cursor::${child.name})];
if (!raw)
raw = RawSyntax::make(SyntaxKind::${child_node.syntax_kind},
Expand Down
16 changes: 8 additions & 8 deletions unittests/Syntax/DeclSyntaxTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ TEST(DeclSyntaxTests, TypealiasMakeAPIs) {
auto GenericParams = GenericParameterClauseSyntaxBuilder()
.useLeftAngleBracket(LeftAngle)
.useRightAngleBracket(RightAngle)
.addGenericParameter(ElementParam)
.addGenericParameterListMember(ElementParam)
.build();
auto Assignment = SyntaxFactory::makeEqualToken({}, { Trivia::spaces(1) });
auto ElementType = SyntaxFactory::makeTypeIdentifier("Element", {}, {});
Expand All @@ -97,7 +97,7 @@ TEST(DeclSyntaxTests, TypealiasMakeAPIs) {
auto GenericArgs = GenericArgumentClauseSyntaxBuilder()
.useLeftAngleBracket(LeftAngle)
.useRightAngleBracket(SyntaxFactory::makeRightAngleToken({}, {}))
.addGenericArgument(ElementArg)
.addArgumentsMember(ElementArg)
.build();

auto Array = SyntaxFactory::makeIdentifier("Array", {}, {});
Expand Down Expand Up @@ -126,7 +126,7 @@ TEST(DeclSyntaxTests, TypealiasWithAPIs) {
auto GenericParams = GenericParameterClauseSyntaxBuilder()
.useLeftAngleBracket(LeftAngle)
.useRightAngleBracket(RightAngle)
.addGenericParameter(ElementParam)
.addGenericParameterListMember(ElementParam)
.build();
auto Equal = SyntaxFactory::makeEqualToken({}, { Trivia::spaces(1) });

Expand All @@ -135,7 +135,7 @@ TEST(DeclSyntaxTests, TypealiasWithAPIs) {
auto GenericArgs = GenericArgumentClauseSyntaxBuilder()
.useLeftAngleBracket(LeftAngle)
.useRightAngleBracket(SyntaxFactory::makeRightAngleToken({}, {}))
.addGenericArgument(ElementArg)
.addArgumentsMember(ElementArg)
.build();

auto Array = SyntaxFactory::makeIdentifier("Array", {}, {});
Expand Down Expand Up @@ -170,7 +170,7 @@ TEST(DeclSyntaxTests, TypealiasBuilderAPIs) {
auto GenericParams = GenericParameterClauseSyntaxBuilder()
.useLeftAngleBracket(LeftAngle)
.useRightAngleBracket(RightAngle)
.addGenericParameter(ElementParam)
.addGenericParameterListMember(ElementParam)
.build();
auto Equal =
SyntaxFactory::makeEqualToken({}, { Trivia::spaces(1) });
Expand All @@ -181,7 +181,7 @@ TEST(DeclSyntaxTests, TypealiasBuilderAPIs) {
auto GenericArgs = GenericArgumentClauseSyntaxBuilder()
.useLeftAngleBracket(LeftAngle)
.useRightAngleBracket(SyntaxFactory::makeRightAngleToken({}, {}))
.addGenericArgument(ElementArg)
.addArgumentsMember(ElementArg)
.build();

auto Array = SyntaxFactory::makeIdentifier("Array", {}, {});
Expand Down Expand Up @@ -519,8 +519,8 @@ GenericParameterClauseSyntax getCannedGenericParams() {
auto T = SyntaxFactory::makeGenericParameter(TType, Comma);
auto U = SyntaxFactory::makeGenericParameter(UType, None);

GB.addGenericParameter(T);
GB.addGenericParameter(U);
GB.addGenericParameterListMember(T);
GB.addGenericParameterListMember(U);
GB.useLeftAngleBracket(LAngle);
GB.useRightAngleBracket(RAngle);

Expand Down
10 changes: 5 additions & 5 deletions unittests/Syntax/ExprSyntaxTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ TEST(ExprSyntaxTests, SymbolicReferenceExprGetAPIs) {
ArgBuilder
.useLeftAngleBracket(SyntaxFactory::makeLeftAngleToken({}, {}))
.useRightAngleBracket(SyntaxFactory::makeRightAngleToken({}, {}))
.addGenericArgument(GenericArg);
.addArgumentsMember(GenericArg);

auto GenericArgs = ArgBuilder.build();

Expand Down Expand Up @@ -98,7 +98,7 @@ TEST(ExprSyntaxTests, SymbolicReferenceExprMakeAPIs) {
ArgBuilder
.useLeftAngleBracket(SyntaxFactory::makeLeftAngleToken({}, {}))
.useRightAngleBracket(SyntaxFactory::makeRightAngleToken({}, {}))
.addGenericArgument(GenericArg);
.addArgumentsMember(GenericArg);
auto GenericArgs = ArgBuilder.build();

{
Expand Down Expand Up @@ -135,7 +135,7 @@ TEST(ExprSyntaxTests, SymbolicReferenceExprWithAPIs) {
ArgBuilder
.useLeftAngleBracket(SyntaxFactory::makeLeftAngleToken({}, {}))
.useRightAngleBracket(SyntaxFactory::makeRightAngleToken({}, {}))
.addGenericArgument(GenericArg);
.addArgumentsMember(GenericArg);
auto GenericArgs = ArgBuilder.build();

{
Expand Down Expand Up @@ -528,15 +528,15 @@ TEST(ExprSyntaxTests, FunctionCallExprBuilderAPIs) {
{
llvm::SmallString<64> Scratch;
llvm::raw_svector_ostream OS(Scratch);
CallBuilder.addFunctionCallArgument(OneArg);
CallBuilder.addArgumentListMember(OneArg);
CallBuilder.build().print(OS);
ASSERT_EQ(OS.str().str(), "foo(1, )");
}

{
llvm::SmallString<64> Scratch;
llvm::raw_svector_ostream OS(Scratch);
CallBuilder.addFunctionCallArgument(OneArg.withTrailingComma(NoComma));
CallBuilder.addArgumentListMember(OneArg.withTrailingComma(NoComma));
CallBuilder.build().print(OS);
ASSERT_EQ(OS.str().str(), "foo(1, 1)");
}
Expand Down
18 changes: 9 additions & 9 deletions unittests/Syntax/TypeSyntaxTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,9 @@ TEST(TypeSyntaxTests, TupleBuilderAPIs) {
auto StringId = SyntaxFactory::makeIdentifier("String", {}, {});
auto StringType = SyntaxFactory::makeSimpleTypeIdentifier(StringId, None);
auto String = SyntaxFactory::makeTupleTypeElement(StringType, Comma);
Builder.addTupleTypeElement(IntWithComma);
Builder.addTupleTypeElement(String);
Builder.addTupleTypeElement(Int);
Builder.addElementsMember(IntWithComma);
Builder.addElementsMember(String);
Builder.addElementsMember(Int);
Builder.useRightParen(SyntaxFactory::makeRightParenToken({}, {}));

auto TupleType = Builder.build();
Expand All @@ -229,8 +229,8 @@ TEST(TypeSyntaxTests, TupleBuilderAPIs) {
auto yTypeElt = SyntaxFactory::makeTupleTypeElement(yLabel, Colon,
Int)
.withInOut(inout);
Builder.addTupleTypeElement(xTypeElt);
Builder.addTupleTypeElement(yTypeElt);
Builder.addElementsMember(xTypeElt);
Builder.addElementsMember(yTypeElt);
Builder.useRightParen(SyntaxFactory::makeRightParenToken({}, {}));

auto TupleType = Builder.build();
Expand Down Expand Up @@ -628,8 +628,8 @@ TEST(TypeSyntaxTests, FunctionTypeBuilderAPIs) {

Builder.useLeftParen(LeftParen)
.useRightParen(RightParen)
.addTupleTypeElement(xArg)
.addTupleTypeElement(yArg)
.addArgumentsMember(xArg)
.addArgumentsMember(yArg)
.useThrowsOrRethrowsKeyword(Throws)
.useArrow(Arrow)
.useReturnType(Int);
Expand All @@ -646,8 +646,8 @@ TEST(TypeSyntaxTests, FunctionTypeBuilderAPIs) {
Int, None, None, None);
Builder.useLeftParen(LeftParen)
.useRightParen(RightParen)
.addTupleTypeElement(IntArg.withTrailingComma(Comma))
.addTupleTypeElement(IntArg)
.addArgumentsMember(IntArg.withTrailingComma(Comma))
.addArgumentsMember(IntArg)
.useThrowsOrRethrowsKeyword(Rethrows)
.useArrow(Arrow)
.useReturnType(Int);
Expand Down
2 changes: 1 addition & 1 deletion unittests/Syntax/UnknownSyntaxTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ SymbolicReferenceExprSyntax getCannedSymbolicRef() {
ArgBuilder
.useLeftAngleBracket(SyntaxFactory::makeLeftAngleToken({}, {}))
.useRightAngleBracket(SyntaxFactory::makeRightAngleToken({}, {}))
.addGenericArgument(IntArg);
.addArgumentsMember(IntArg);

return SyntaxFactory::makeSymbolicReferenceExpr(Array, ArgBuilder.build());
}
Expand Down