libSyntax: use node choices for closure parameters.

This is to incorporate two styles of closure parameters: "a, b, c" or "(a:
T1, b: T2, c: T3)".

Author: nkcsgexi

Diff for: include/swift/Syntax/RawSyntax.h

@@ -101,14 +101,14 @@ using llvm::StringRef;
 #endif
 
 #ifndef NDEBUG
-#define syntax_assert_node_choice(Raw, CursorName)                             \
+#define syntax_assert_node_choice(Raw, CursorName, NodeName)                   \
   ({                                                                           \
     auto Child = Raw->getChild(Cursor::CursorName);                            \
     auto Node = make<Syntax>(Child);                                           \
-    assert(check##CursorName(Node));                                           \
+    assert(check##CursorName##In##NodeName(Node));                             \
   })
 #else
-#define syntax_assert_node_choice(Raw, CursorName) ({});
+#define syntax_assert_node_choice(Raw, CursorName, NodeName) ({});
 #endif
 
 namespace swift {

Diff for: include/swift/Syntax/SyntaxNodes.h.gyb

@@ -100,7 +100,8 @@ public:
 %   end
 % end
 
-bool checkAccessorListOrStmtList(const Syntax &S);
+bool checkAccessorListOrStmtListInAccessorBlock(const Syntax &S);
+bool checkInputInClosureSignature(const Syntax &S);
 }
 }
 

Diff for: lib/Syntax/SyntaxFactory.cpp.gyb

@@ -149,7 +149,7 @@ SyntaxFactory::createSyntax(SyntaxKind Kind, llvm::ArrayRef<Syntax> Elements) {
 %       elif child.node_choices:
         {   ${option},
             [] (const Syntax &S) {
-              return check${child.name}(S);
+              return check${child.name}In${node.syntax_kind}(S);
             }
         },
 %       else:

Diff for: lib/Syntax/SyntaxNodes.cpp.gyb

@@ -25,11 +25,17 @@ using namespace swift;
 using namespace swift::syntax;
 
 
-bool swift::syntax::checkAccessorListOrStmtList(const Syntax &S) {
+bool swift::syntax::
+checkAccessorListOrStmtListInAccessorBlock(const Syntax &S) {
   return S.getKind() == SyntaxKind::AccessorList ||
     S.getKind() == SyntaxKind::StmtList;
 }
 
+bool swift::syntax::checkInputInClosureSignature(const Syntax &S) {
+  return S.getKind() == SyntaxKind::ClosureParamList ||
+    S.getKind() == SyntaxKind::ParameterClause;
+}
+
 % for node in SYNTAX_NODES:
 %   if node.requires_validation():
 void ${node.name}::validate() const {
@@ -51,7 +57,7 @@ void ${node.name}::validate() const {
                                  tok::${token_kind}, ${choices});
 %       end
 %       if child.node_choices:
-  syntax_assert_node_choice(raw, ${child.name});
+  syntax_assert_node_choice(raw, ${child.name}, ${node.syntax_kind});
 %       end
 %     end
 }

Diff for: utils/gyb_syntax_support/ExprNodes.py

@@ -300,9 +300,11 @@
          children=[
              Child('Capture', kind='ClosureCaptureSignature',
                    is_optional=True),
-             # FIXME: one and only one of these two children is required
-             Child('SimpleInput', kind='ClosureParamList', is_optional=True),
-             Child('Input', kind='ParameterClause', is_optional=True),
+             Child('Input', kind='Syntax', is_optional=True,
+                   node_choices=[
+                       Child('SimpleInput', kind='ClosureParamList'),
+                       Child('Input', kind='ParameterClause'),
+                   ]),
              Child('ThrowsTok', kind='ThrowsToken', is_optional=True),
              Child('Output', kind='ReturnClause', is_optional=True),
              Child('InTok', kind='InToken'),

Diff for: utils/gyb_syntax_support/__init__.py

@@ -28,6 +28,8 @@ def make_missing_child(child):
     else:
         missing_kind = "Unknown" if child.syntax_kind == "Syntax" \
                        else child.syntax_kind
+        if child.node_choices:
+            return make_missing_child(child.node_choices[0])
         return 'RawSyntax::missing(SyntaxKind::%s)' % missing_kind