Skip to content

Commit a2fac90

Browse files
committed
Revise test for the new multiple-closure syntax.
This isn't really correct --- we're missing nodes for the call. But it gets the test passing.
1 parent 015d838 commit a2fac90

File tree

2 files changed

+13
-35
lines changed

2 files changed

+13
-35
lines changed

test/Syntax/Outputs/round_trip_parse_gen.swift.withkinds

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@ class C <MemberDeclBlock>{<MemberDeclListItem><FunctionDecl>
9494
_ </DiscardAssignmentExpr><AssignmentExpr>= </AssignmentExpr><MemberAccessExpr>.foo</MemberAccessExpr></SequenceExpr><SequenceExpr><DiscardAssignmentExpr>
9595
_ </DiscardAssignmentExpr><AssignmentExpr>= </AssignmentExpr><FunctionCallExpr><MemberAccessExpr>.foo</MemberAccessExpr>(<TupleExprElement>x: <IntegerLiteralExpr>12</IntegerLiteralExpr></TupleExprElement>)</FunctionCallExpr></SequenceExpr><SequenceExpr><DiscardAssignmentExpr>
9696
_ </DiscardAssignmentExpr><AssignmentExpr>= </AssignmentExpr><FunctionCallExpr><MemberAccessExpr>.foo </MemberAccessExpr><ClosureExpr>{ <IntegerLiteralExpr>12 </IntegerLiteralExpr>}</ClosureExpr></FunctionCallExpr></SequenceExpr><SequenceExpr><DiscardAssignmentExpr>
97-
_ </DiscardAssignmentExpr><AssignmentExpr>= </AssignmentExpr><FunctionCallExpr><MemberAccessExpr>.foo </MemberAccessExpr><MultipleTrailingClosureClause>{<MultipleTrailingClosureElement>
98-
arg1: <ClosureExpr>{ <IntegerLiteralExpr>12 </IntegerLiteralExpr>}</ClosureExpr></MultipleTrailingClosureElement>
99-
}</MultipleTrailingClosureClause></FunctionCallExpr></SequenceExpr><SequenceExpr><DiscardAssignmentExpr>
10097
_ </DiscardAssignmentExpr><AssignmentExpr>= </AssignmentExpr><SubscriptExpr><MemberAccessExpr>.foo</MemberAccessExpr>[<TupleExprElement><IntegerLiteralExpr>12</IntegerLiteralExpr></TupleExprElement>]</SubscriptExpr></SequenceExpr><SequenceExpr><DiscardAssignmentExpr>
10198
_ </DiscardAssignmentExpr><AssignmentExpr>= </AssignmentExpr><MemberAccessExpr><MemberAccessExpr>.foo</MemberAccessExpr>.bar</MemberAccessExpr></SequenceExpr>
10299
}</CodeBlock></FunctionDecl></MemberDeclListItem><MemberDeclListItem><InitializerDecl>
@@ -260,29 +257,21 @@ func closure<FunctionSignature><ParameterClause>() </ParameterClause></FunctionS
260257
func postfix<FunctionSignature><ParameterClause>() </ParameterClause></FunctionSignature><CodeBlock>{<FunctionCallExpr><IdentifierExpr>
261258
foo</IdentifierExpr>()</FunctionCallExpr><FunctionCallExpr><IdentifierExpr>
262259
foo</IdentifierExpr>() <ClosureExpr>{}</ClosureExpr></FunctionCallExpr><FunctionCallExpr><IdentifierExpr>
263-
foo </IdentifierExpr><ClosureExpr>{}</ClosureExpr></FunctionCallExpr><FunctionCallExpr><IdentifierExpr>
264-
foo </IdentifierExpr><MultipleTrailingClosureClause>{<MultipleTrailingClosureElement>
265-
arg1: <ClosureExpr>{}</ClosureExpr></MultipleTrailingClosureElement>
266-
}</MultipleTrailingClosureClause></FunctionCallExpr><FunctionCallExpr><IdentifierExpr>
267-
foo</IdentifierExpr>() <MultipleTrailingClosureClause>{<MultipleTrailingClosureElement>
268-
arg1: <ClosureExpr>{}</ClosureExpr></MultipleTrailingClosureElement><MultipleTrailingClosureElement>
269-
arg2: <ClosureExpr>{}</ClosureExpr></MultipleTrailingClosureElement>
270-
}</MultipleTrailingClosureClause></FunctionCallExpr><FunctionCallExpr><IdentifierExpr>
260+
foo </IdentifierExpr><ClosureExpr>{}</ClosureExpr></FunctionCallExpr><IdentifierExpr>
261+
foo</IdentifierExpr>() <ClosureExpr>{}</ClosureExpr>
262+
arg2: <ClosureExpr>{}</ClosureExpr><FunctionCallExpr><IdentifierExpr>
271263
foo </IdentifierExpr><ClosureExpr>{}</ClosureExpr></FunctionCallExpr><FunctionCallExpr><MemberAccessExpr><IdentifierExpr>
272264
foo</IdentifierExpr>.bar</MemberAccessExpr>()</FunctionCallExpr><FunctionCallExpr><MemberAccessExpr><IdentifierExpr>
273-
foo</IdentifierExpr>.bar</MemberAccessExpr>() <ClosureExpr>{}</ClosureExpr></FunctionCallExpr><FunctionCallExpr><MemberAccessExpr><IdentifierExpr>
274-
foo</IdentifierExpr>.bar</MemberAccessExpr>() <MultipleTrailingClosureClause>{<MultipleTrailingClosureElement>
275-
arg1: <ClosureExpr>{}</ClosureExpr></MultipleTrailingClosureElement>
276-
}</MultipleTrailingClosureClause></FunctionCallExpr><FunctionCallExpr><MemberAccessExpr><IdentifierExpr>
265+
foo</IdentifierExpr>.bar</MemberAccessExpr>() <ClosureExpr>{}</ClosureExpr></FunctionCallExpr><MemberAccessExpr><IdentifierExpr>
266+
foo</IdentifierExpr>.bar</MemberAccessExpr>() <ClosureExpr>{}</ClosureExpr>
267+
arg2: <ClosureExpr>{}</ClosureExpr><FunctionCallExpr><MemberAccessExpr><IdentifierExpr>
277268
foo</IdentifierExpr>.bar </MemberAccessExpr><ClosureExpr>{}</ClosureExpr></FunctionCallExpr><SubscriptExpr><IdentifierExpr>
278269
foo</IdentifierExpr>[]</SubscriptExpr><SubscriptExpr><IdentifierExpr>
279270
foo</IdentifierExpr>[<TupleExprElement><IntegerLiteralExpr>1</IntegerLiteralExpr></TupleExprElement>]</SubscriptExpr><SubscriptExpr><IdentifierExpr>
280271
foo</IdentifierExpr>[] <ClosureExpr>{}</ClosureExpr></SubscriptExpr><SubscriptExpr><IdentifierExpr>
281-
foo</IdentifierExpr>[<TupleExprElement><IntegerLiteralExpr>1</IntegerLiteralExpr></TupleExprElement>] <ClosureExpr>{}</ClosureExpr></SubscriptExpr><SubscriptExpr><IdentifierExpr>
282-
foo</IdentifierExpr>[<TupleExprElement><IntegerLiteralExpr>1</IntegerLiteralExpr></TupleExprElement>] <MultipleTrailingClosureClause>{<MultipleTrailingClosureElement>
283-
arg1: <ClosureExpr>{}</ClosureExpr></MultipleTrailingClosureElement><MultipleTrailingClosureElement>
284-
arg2: <ClosureExpr>{}</ClosureExpr></MultipleTrailingClosureElement>
285-
}</MultipleTrailingClosureClause></SubscriptExpr><SubscriptExpr><SubscriptExpr><IdentifierExpr>
272+
foo</IdentifierExpr>[<TupleExprElement><IntegerLiteralExpr>1</IntegerLiteralExpr></TupleExprElement>] <ClosureExpr>{}</ClosureExpr></SubscriptExpr><IdentifierExpr>
273+
foo</IdentifierExpr>[<TupleExprElement><IntegerLiteralExpr>1</IntegerLiteralExpr></TupleExprElement>] <ClosureExpr>{}</ClosureExpr>
274+
arg2: <ClosureExpr>{}</ClosureExpr><SubscriptExpr><SubscriptExpr><IdentifierExpr>
286275
foo</IdentifierExpr>[<TupleExprElement><IntegerLiteralExpr>1</IntegerLiteralExpr></TupleExprElement>]</SubscriptExpr>[<TupleExprElement><IntegerLiteralExpr>2</IntegerLiteralExpr>,</TupleExprElement><TupleExprElement>x:<IntegerLiteralExpr>3</IntegerLiteralExpr></TupleExprElement>]</SubscriptExpr><MemberAccessExpr><FunctionCallExpr><ForcedValueExpr><MemberAccessExpr><PostfixUnaryExpr><OptionalChainingExpr><IdentifierExpr>
287276
foo</IdentifierExpr>?</OptionalChainingExpr>++</PostfixUnaryExpr>.bar</MemberAccessExpr>!</ForcedValueExpr>(<TupleExprElement><IdentifierExpr>baz</IdentifierExpr></TupleExprElement>)</FunctionCallExpr>.self</MemberAccessExpr><MemberAccessExpr><FunctionCallExpr><IdentifierExpr>
288277
foo</IdentifierExpr>()</FunctionCallExpr>.0</MemberAccessExpr><MemberAccessExpr><SpecializeExpr><IdentifierExpr>

test/Syntax/round_trip_parse_gen.swift

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@ class C {
9494
_ = .foo
9595
_ = .foo(x: 12)
9696
_ = .foo { 12 }
97-
_ = .foo {
98-
arg1: { 12 }
99-
}
10097
_ = .foo[12]
10198
_ = .foo.bar
10299
}
@@ -261,28 +258,20 @@ func postfix() {
261258
foo()
262259
foo() {}
263260
foo {}
264-
foo {
265-
arg1: {}
266-
}
267-
foo() {
268-
arg1: {}
261+
foo() {}
269262
arg2: {}
270-
}
271263
foo {}
272264
foo.bar()
273265
foo.bar() {}
274-
foo.bar() {
275-
arg1: {}
276-
}
266+
foo.bar() {}
267+
arg2: {}
277268
foo.bar {}
278269
foo[]
279270
foo[1]
280271
foo[] {}
281272
foo[1] {}
282-
foo[1] {
283-
arg1: {}
273+
foo[1] {}
284274
arg2: {}
285-
}
286275
foo[1][2,x:3]
287276
foo?++.bar!(baz).self
288277
foo().0

0 commit comments

Comments
 (0)