Merge pull request swiftlang#22214 from bannzai/syntax/add/function/make_ellipsis_token

[SwiftSyntax] Add SyntaxFactory.makeEllipsisToken function.

Author: rintaro

lib/Parse/ParsePattern.cpp

@@ -360,8 +360,10 @@ Parser::parseParameterClause(SourceLoc &leftParenLoc,
     }
 
     // '...'?
-    if (Tok.isEllipsis())
+    if (Tok.isEllipsis()) {
+      Tok.setKind(tok::ellipsis);
       param.EllipsisLoc = consumeToken();
+    }
 
     // ('=' expr)?
     if (Tok.is(tok::equal)) {

test/Frontend/emit-syntax.swift

@@ -13,6 +13,47 @@ struct Foo {
 // CHECK: "kind":"r_brace"
 }
 
+// CHECK: "kind":"kw_func"
+// CHECK: "kind":"identifier"
+// CHECK: "text":"Bar"
+// CHECK: "kind":"l_paren"
+// CHECK: "kind":"FunctionParameterList"
+// CHECK: "kind":"FunctionParameter"
+// CHECK: "kind":"identifier"
+// CHECK: "text":"arg1"
+// CHECK: "kind":"colon"
+// CHECK: "kind":"identifier"
+// CHECK: "text":"String"
+// CHECK: null,null
+// CHECK: "kind":"comma"
+// CHECK: "kind":"identifier"
+// CHECK: "text":"arg2"
+// CHECK: "kind":"colon"
+// CHECK: "kind":"identifier"
+// CHECK: "text":"Int"
+// CHECK: "kind":"r_paren"
+// CHECK: "kind":"l_brace"
+func Bar(arg1: String, arg2: Int) {
+// CHECK: "kind":"r_brace"
+}
+
+// CHECK: "kind":"kw_func"
+// CHECK: "text":"CheckParameterList"
+// CHECK: "kind":"l_paren"
+// CHECK: "text":"arg1"
+// CHECK: "text":"String"
+// CHECK: "kind":"ellipsis"
+// CHECK: "presence":"Present"}
+// CHECK: null
+// CHECK: "kind":"comma"
+// CHECK: "text":"arg2"
+// CHECK: "text":"Int"
+// CHECK: "kind":"r_paren"
+// CHECK: "kind":"l_brace"
+func CheckParameterList(arg1: String..., arg2: Int) {
+// CHECK: "kind":"r_brace"
+}
+
 // CHECK: "leadingTrivia":[
 // CHECK: "kind":"LineComment",
 // CHECK: "value":"\/\/ Comment at the end of the file"

unittests/Syntax/DeclSyntaxTests.cpp

@@ -324,6 +324,34 @@ TEST(DeclSyntaxTests, FunctionParameterWithAPIs) {
   }
 }
 
+TEST(DeclSyntaxTests, FunctionParameterWithEllipsis) {
+    auto ExternalName = SyntaxFactory::makeIdentifier("for", {},
+                                                      Trivia::spaces(1));
+    auto LocalName = SyntaxFactory::makeIdentifier("integer", {}, {});
+    auto Colon = SyntaxFactory::makeColonToken(Trivia::spaces(1),
+                                               Trivia::spaces(1));
+    auto Int = SyntaxFactory::makeTypeIdentifier("Int", {},
+                                                 Trivia::spaces(0));
+    auto Ellipsis = SyntaxFactory::makeEllipsisToken({},
+                                                     Trivia::spaces(1));
+    auto Comma = SyntaxFactory::makeCommaToken({}, {});
+    
+    {
+        SmallString<48> Scratch;
+        llvm::raw_svector_ostream OS(Scratch);
+        getCannedFunctionParameter()
+        .withFirstName(ExternalName)
+        .withSecondName(LocalName)
+        .withColon(Colon)
+        .withType(Int)
+        .withEllipsis(Ellipsis)
+        .withDefaultArgument(llvm::None)
+        .withTrailingComma(Comma)
+        .print(OS);
+        ASSERT_EQ(OS.str().str(), "for integer : Int... ,");
+    }
+}
+
 #pragma mark - parameter-list
 
 TEST(DeclSyntaxTests, FunctionParameterListMakeAPIs) {

utils/gyb_syntax_support/DeclNodes.py

@@ -335,7 +335,7 @@
                    is_optional=True),
              Child('Type', kind='Type',
                    is_optional=True),
-             Child('Ellipsis', kind='Token',
+             Child('Ellipsis', kind='EllipsisToken',
                    is_optional=True),
              Child('DefaultArgument', kind='InitializerClause',
                    is_optional=True),

utils/gyb_syntax_support/Token.py

@@ -222,6 +222,7 @@ def macro_name(self):
     Punctuator('PrefixPeriod', 'period_prefix', text='.',
                serialization_code=87),
     Punctuator('Comma', 'comma', text=',', serialization_code=84),
+    Punctuator('Ellipsis', 'ellipsis', text='...', serialization_code=118),
     Punctuator('Colon', 'colon', text=':', serialization_code=82),
     Punctuator('Semicolon', 'semi', text=';', serialization_code=83),
     Punctuator('Equal', 'equal', text='=', serialization_code=86),