Merge pull request #152 from rintaro/tupleelement-functioncallargument

Update for 'TupleElement'/'FunctionCallArgument' consolidation

Author: rintaro

Tests/SwiftSyntaxTest/CustomReflecatbleTests.swift

@@ -112,19 +112,19 @@ public class CustomReflectableTests: XCTestCase {
                                              leadingTrivia: [],
                                              trailingTrivia: [])
         let expr2 = SyntaxFactory.makeIntegerLiteralExpr(digits: token2)
-        let elements = [SyntaxFactory.makeTupleElement(label: nil,
+        let elements = [SyntaxFactory.makeTupleExprElement(label: nil,
                                                        colon: nil,
                                                        expression: expr1,
                                                        trailingComma: nil),
-                        SyntaxFactory.makeTupleElement(label: nil,
+                        SyntaxFactory.makeTupleExprElement(label: nil,
                                                        colon: nil,
                                                        expression: expr2,
                                                        trailingComma: nil)]
-        let tuples = SyntaxFactory.makeTupleElementList(elements)
+        let tuples = SyntaxFactory.makeTupleExprElementList(elements)
         return .init(syntax: tuples,
                      expectedDumped: """
-                                     ▿ SwiftSyntax.TupleElementListSyntax
-                                       ▿ SwiftSyntax.TupleElementSyntax
+                                     ▿ SwiftSyntax.TupleExprElementListSyntax
+                                       ▿ SwiftSyntax.TupleExprElementSyntax
                                          - label: nil
                                          - colon: nil
                                          ▿ expression: SwiftSyntax.IntegerLiteralExprSyntax
@@ -137,7 +137,7 @@ public class CustomReflectableTests: XCTestCase {
                                              ▿ tokenKind: SwiftSyntax.TokenKind.integerLiteral
                                                - integerLiteral: "1"
                                          - trailingComma: nil
-                                       ▿ SwiftSyntax.TupleElementSyntax
+                                       ▿ SwiftSyntax.TupleExprElementSyntax
                                          - label: nil
                                          - colon: nil
                                          ▿ expression: SwiftSyntax.IntegerLiteralExprSyntax
@@ -164,20 +164,20 @@ public class CustomReflectableTests: XCTestCase {
                                              leadingTrivia: [],
                                              trailingTrivia: [])
         let expr2 = SyntaxFactory.makeIntegerLiteralExpr(digits: token2)
-        let elements = [SyntaxFactory.makeTupleElement(label: nil,
+        let elements = [SyntaxFactory.makeTupleExprElement(label: nil,
                                                        colon: nil,
                                                        expression: expr1,
                                                        trailingComma: nil),
-          SyntaxFactory.makeTupleElement(label: nil,
+          SyntaxFactory.makeTupleExprElement(label: nil,
                                          colon: nil,
                                          expression: expr2,
                                          trailingComma: nil)]
-        let tuples = SyntaxFactory.makeTupleElementList(elements)
+        let tuples = SyntaxFactory.makeTupleExprElementList(elements)
         return .init(syntax: tuples.reversed(),
                      expectedDumped: """
-                                     ▿ SwiftSyntax.TupleElementListSyntax.Reversed
-                                       ▿ collection: SwiftSyntax.TupleElementListSyntax
-                                         ▿ SwiftSyntax.TupleElementSyntax
+                                     ▿ SwiftSyntax.TupleExprElementListSyntax.Reversed
+                                       ▿ collection: SwiftSyntax.TupleExprElementListSyntax
+                                         ▿ SwiftSyntax.TupleExprElementSyntax
                                            - label: nil
                                            - colon: nil
                                            ▿ expression: SwiftSyntax.IntegerLiteralExprSyntax
@@ -190,7 +190,7 @@ public class CustomReflectableTests: XCTestCase {
                                                ▿ tokenKind: SwiftSyntax.TokenKind.integerLiteral
                                                  - integerLiteral: "1"
                                            - trailingComma: nil
-                                         ▿ SwiftSyntax.TupleElementSyntax
+                                         ▿ SwiftSyntax.TupleExprElementSyntax
                                            - label: nil
                                            - colon: nil
                                            ▿ expression: SwiftSyntax.IntegerLiteralExprSyntax

Tests/SwiftSyntaxTest/SyntaxFactory.swift

@@ -98,7 +98,7 @@ public class SyntaxFactoryAPITestCase: XCTestCase {
   public func testFunctionCallSyntaxBuilder() {
     let string = SyntaxFactory.makeStringLiteralExpr("Hello, world!")
     let printID = SyntaxFactory.makeVariableExpr("print")
-    let arg = FunctionCallArgumentSyntax {
+    let arg = TupleExprElementSyntax {
       $0.useExpression(string)
     }
     let call = FunctionCallExprSyntax {
@@ -109,13 +109,13 @@ public class SyntaxFactoryAPITestCase: XCTestCase {
     }
     XCTAssertEqual("\(call)", "print(\"Hello, world!\")")
 
-    let terminatorArg = FunctionCallArgumentSyntax {
+    let terminatorArg = TupleExprElementSyntax {
       $0.useLabel(SyntaxFactory.makeIdentifier("terminator"))
       $0.useColon(SyntaxFactory.makeColonToken(trailingTrivia: .spaces(1)))
       $0.useExpression(SyntaxFactory.makeStringLiteralExpr(" "))
     }
     let callWithTerminator = call.withArgumentList(
-      SyntaxFactory.makeFunctionCallArgumentList([
+      SyntaxFactory.makeTupleExprElementList([
         arg.withTrailingComma(
           SyntaxFactory.makeCommaToken(trailingTrivia: .spaces(1))),
         terminatorArg
@@ -129,7 +129,7 @@ public class SyntaxFactoryAPITestCase: XCTestCase {
   public func testWithOptionalChild() {
     let string = SyntaxFactory.makeStringLiteralExpr("Hello, world!")
     let printID = SyntaxFactory.makeVariableExpr("print")
-    let arg = FunctionCallArgumentSyntax {
+    let arg = TupleExprElementSyntax {
       $0.useExpression(string)
     }
     let call1 = FunctionCallExprSyntax {

lit_tests/output/print_verify_tree.swift.withkind

@@ -3,9 +3,9 @@
 // RUN: diff -u %t.result %S/output/print_verify_tree.swift.withkind
 
 func </TokenSyntax><TokenSyntax>foo</TokenSyntax><FunctionSignatureSyntax><ParameterClauseSyntax><TokenSyntax>(</TokenSyntax><FunctionParameterListSyntax></FunctionParameterListSyntax><TokenSyntax>) </TokenSyntax></ParameterClauseSyntax></FunctionSignatureSyntax><CodeBlockSyntax><TokenSyntax>{</TokenSyntax><CodeBlockItemListSyntax><CodeBlockItemSyntax><IfConfigDeclSyntax><IfConfigClauseListSyntax><IfConfigClauseSyntax><TokenSyntax>
-#if </TokenSyntax><FunctionCallExprSyntax><IdentifierExprSyntax><TokenSyntax>swift</TokenSyntax></IdentifierExprSyntax><TokenSyntax>(</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><PrefixOperatorExprSyntax><TokenSyntax>>=</TokenSyntax><FloatLiteralExprSyntax><TokenSyntax>3.2</TokenSyntax></FloatLiteralExprSyntax></PrefixOperatorExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax><CodeBlockItemListSyntax><CodeBlockItemSyntax><FunctionCallExprSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>
-    components</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>append</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>(</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><StringLiteralExprSyntax><TokenSyntax>"</TokenSyntax><StringLiteralSegmentsSyntax><StringSegmentSyntax><TokenSyntax>-b \"</TokenSyntax></StringSegmentSyntax><ExpressionSegmentSyntax><TokenSyntax>\</TokenSyntax><TokenSyntax>(</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><SubscriptExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>[</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><PrefixOperatorExprSyntax><TokenSyntax>..<</TokenSyntax><FunctionCallExprSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>index</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>(</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><TokenSyntax>before</TokenSyntax><TokenSyntax>: </TokenSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>endIndex</TokenSyntax></MemberAccessExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax></PrefixOperatorExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>]</TokenSyntax></SubscriptExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>)</TokenSyntax></ExpressionSegmentSyntax><StringSegmentSyntax><TokenSyntax>\"</TokenSyntax></StringSegmentSyntax></StringLiteralSegmentsSyntax><TokenSyntax>"</TokenSyntax></StringLiteralExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax></CodeBlockItemSyntax></CodeBlockItemListSyntax></IfConfigClauseSyntax><IfConfigClauseSyntax><TokenSyntax>
+#if </TokenSyntax><FunctionCallExprSyntax><IdentifierExprSyntax><TokenSyntax>swift</TokenSyntax></IdentifierExprSyntax><TokenSyntax>(</TokenSyntax><TupleExprElementListSyntax><TupleExprElementSyntax><PrefixOperatorExprSyntax><TokenSyntax>>=</TokenSyntax><FloatLiteralExprSyntax><TokenSyntax>3.2</TokenSyntax></FloatLiteralExprSyntax></PrefixOperatorExprSyntax></TupleExprElementSyntax></TupleExprElementListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax><CodeBlockItemListSyntax><CodeBlockItemSyntax><FunctionCallExprSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>
+    components</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>append</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>(</TokenSyntax><TupleExprElementListSyntax><TupleExprElementSyntax><StringLiteralExprSyntax><TokenSyntax>"</TokenSyntax><StringLiteralSegmentsSyntax><StringSegmentSyntax><TokenSyntax>-b \"</TokenSyntax></StringSegmentSyntax><ExpressionSegmentSyntax><TokenSyntax>\</TokenSyntax><TokenSyntax>(</TokenSyntax><TupleExprElementListSyntax><TupleExprElementSyntax><SubscriptExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>[</TokenSyntax><TupleExprElementListSyntax><TupleExprElementSyntax><PrefixOperatorExprSyntax><TokenSyntax>..<</TokenSyntax><FunctionCallExprSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>index</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>(</TokenSyntax><TupleExprElementListSyntax><TupleExprElementSyntax><TokenSyntax>before</TokenSyntax><TokenSyntax>: </TokenSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>endIndex</TokenSyntax></MemberAccessExprSyntax></TupleExprElementSyntax></TupleExprElementListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax></PrefixOperatorExprSyntax></TupleExprElementSyntax></TupleExprElementListSyntax><TokenSyntax>]</TokenSyntax></SubscriptExprSyntax></TupleExprElementSyntax></TupleExprElementListSyntax><TokenSyntax>)</TokenSyntax></ExpressionSegmentSyntax><StringSegmentSyntax><TokenSyntax>\"</TokenSyntax></StringSegmentSyntax></StringLiteralSegmentsSyntax><TokenSyntax>"</TokenSyntax></StringLiteralExprSyntax></TupleExprElementSyntax></TupleExprElementListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax></CodeBlockItemSyntax></CodeBlockItemListSyntax></IfConfigClauseSyntax><IfConfigClauseSyntax><TokenSyntax>
 #else</TokenSyntax><CodeBlockItemListSyntax><CodeBlockItemSyntax><FunctionCallExprSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>
-    components</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>append</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>(</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><StringLiteralExprSyntax><TokenSyntax>"</TokenSyntax><StringLiteralSegmentsSyntax><StringSegmentSyntax><TokenSyntax>-b \"</TokenSyntax></StringSegmentSyntax><ExpressionSegmentSyntax><TokenSyntax>\</TokenSyntax><TokenSyntax>(</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><FunctionCallExprSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>substring</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>(</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><TokenSyntax>to</TokenSyntax><TokenSyntax>: </TokenSyntax><FunctionCallExprSyntax><MemberAccessExprSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>characters</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>index</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>(</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><TokenSyntax>before</TokenSyntax><TokenSyntax>: </TokenSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>endIndex</TokenSyntax></MemberAccessExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>)</TokenSyntax></ExpressionSegmentSyntax><StringSegmentSyntax><TokenSyntax>\"</TokenSyntax></StringSegmentSyntax></StringLiteralSegmentsSyntax><TokenSyntax>"</TokenSyntax></StringLiteralExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax></CodeBlockItemSyntax></CodeBlockItemListSyntax></IfConfigClauseSyntax></IfConfigClauseListSyntax><TokenSyntax>
+    components</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>append</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>(</TokenSyntax><TupleExprElementListSyntax><TupleExprElementSyntax><StringLiteralExprSyntax><TokenSyntax>"</TokenSyntax><StringLiteralSegmentsSyntax><StringSegmentSyntax><TokenSyntax>-b \"</TokenSyntax></StringSegmentSyntax><ExpressionSegmentSyntax><TokenSyntax>\</TokenSyntax><TokenSyntax>(</TokenSyntax><TupleExprElementListSyntax><TupleExprElementSyntax><FunctionCallExprSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>substring</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>(</TokenSyntax><TupleExprElementListSyntax><TupleExprElementSyntax><TokenSyntax>to</TokenSyntax><TokenSyntax>: </TokenSyntax><FunctionCallExprSyntax><MemberAccessExprSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>characters</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>index</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>(</TokenSyntax><TupleExprElementListSyntax><TupleExprElementSyntax><TokenSyntax>before</TokenSyntax><TokenSyntax>: </TokenSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>endIndex</TokenSyntax></MemberAccessExprSyntax></TupleExprElementSyntax></TupleExprElementListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax></TupleExprElementSyntax></TupleExprElementListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax></TupleExprElementSyntax></TupleExprElementListSyntax><TokenSyntax>)</TokenSyntax></ExpressionSegmentSyntax><StringSegmentSyntax><TokenSyntax>\"</TokenSyntax></StringSegmentSyntax></StringLiteralSegmentsSyntax><TokenSyntax>"</TokenSyntax></StringLiteralExprSyntax></TupleExprElementSyntax></TupleExprElementListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax></CodeBlockItemSyntax></CodeBlockItemListSyntax></IfConfigClauseSyntax></IfConfigClauseListSyntax><TokenSyntax>
 #endif</TokenSyntax></IfConfigDeclSyntax></CodeBlockItemSyntax></CodeBlockItemListSyntax><TokenSyntax>
 }</TokenSyntax></CodeBlockSyntax></FunctionDeclSyntax></CodeBlockItemSyntax></CodeBlockItemListSyntax><TokenSyntax></TokenSyntax></SourceFileSyntax>