Merge pull request #41804 from ahoppen/pr/swiftsyntax-any-type

[Parser] Support 'any' type in SwiftSyntax

Author: ahoppen

lib/Parse/ParseType.cpp

@@ -800,7 +800,8 @@ Parser::parseTypeIdentifier(bool isParsingQualifiedDeclBaseType) {
 ///     type-composition '&' type-simple
 ParserResult<TypeRepr>
 Parser::parseTypeSimpleOrComposition(Diag<> MessageID, ParseTypeReason reason) {
-  SyntaxParsingContext SomeTypeContext(SyntaxContext, SyntaxKind::SomeType);
+  SyntaxParsingContext ConstrainedSugarTypeContext(
+      SyntaxContext, SyntaxKind::ConstrainedSugarType);
   // Check for the opaque modifier.
   // This is only semantically allowed in certain contexts, but we parse it
   // generally for diagnostics and recovery.
@@ -816,7 +817,7 @@ Parser::parseTypeSimpleOrComposition(Diag<> MessageID, ParseTypeReason reason) {
     anyLoc = consumeToken();
   } else {
     // This isn't a some type.
-    SomeTypeContext.setTransparent();
+    ConstrainedSugarTypeContext.setTransparent();
   }
 
   auto applyOpaque = [&](TypeRepr *type) -> TypeRepr * {

test/Syntax/Outputs/round_trip_parse_gen.swift.withkinds

@@ -580,9 +580,9 @@ func foo<FunctionSignature><ParameterClause>() </ParameterClause></FunctionSigna
 #assert(<BooleanLiteralExpr>false</BooleanLiteralExpr>)</PoundAssertStmt><PoundAssertStmt>
 #assert(<BooleanLiteralExpr>true</BooleanLiteralExpr>, "hello world")</PoundAssertStmt><FunctionDecl><DeclModifier>
 
-public </DeclModifier>func anyFoo<FunctionSignature><ParameterClause>() </ParameterClause><ReturnClause>-> <SomeType>some <SimpleTypeIdentifier>Foo </SimpleTypeIdentifier></SomeType></ReturnClause></FunctionSignature><CodeBlock>{}</CodeBlock></FunctionDecl><FunctionDecl><DeclModifier>
-public </DeclModifier>func qoo<FunctionSignature><ParameterClause>() </ParameterClause><ReturnClause>-> <SomeType>some <CompositionType><CompositionTypeElement><SimpleTypeIdentifier>O </SimpleTypeIdentifier>& </CompositionTypeElement><CompositionTypeElement><SimpleTypeIdentifier>O2 </SimpleTypeIdentifier></CompositionTypeElement></CompositionType></SomeType></ReturnClause></FunctionSignature><CodeBlock>{}</CodeBlock></FunctionDecl><FunctionDecl>
-func zlop<FunctionSignature><ParameterClause>() </ParameterClause><ReturnClause>-> <SomeType>some <CompositionType><CompositionTypeElement><SimpleTypeIdentifier>C </SimpleTypeIdentifier>& </CompositionTypeElement><CompositionTypeElement><SimpleTypeIdentifier>AnyObject </SimpleTypeIdentifier>& </CompositionTypeElement><CompositionTypeElement><SimpleTypeIdentifier>P </SimpleTypeIdentifier></CompositionTypeElement></CompositionType></SomeType></ReturnClause></FunctionSignature><CodeBlock>{}</CodeBlock></FunctionDecl><FunctionDecl><CustomAttribute>
+public </DeclModifier>func anyFoo<FunctionSignature><ParameterClause>() </ParameterClause><ReturnClause>-> <ConstrainedSugarType>some <SimpleTypeIdentifier>Foo </SimpleTypeIdentifier></ConstrainedSugarType></ReturnClause></FunctionSignature><CodeBlock>{}</CodeBlock></FunctionDecl><FunctionDecl><DeclModifier>
+public </DeclModifier>func qoo<FunctionSignature><ParameterClause>() </ParameterClause><ReturnClause>-> <ConstrainedSugarType>some <CompositionType><CompositionTypeElement><SimpleTypeIdentifier>O </SimpleTypeIdentifier>& </CompositionTypeElement><CompositionTypeElement><SimpleTypeIdentifier>O2 </SimpleTypeIdentifier></CompositionTypeElement></CompositionType></ConstrainedSugarType></ReturnClause></FunctionSignature><CodeBlock>{}</CodeBlock></FunctionDecl><FunctionDecl>
+func zlop<FunctionSignature><ParameterClause>() </ParameterClause><ReturnClause>-> <ConstrainedSugarType>some <CompositionType><CompositionTypeElement><SimpleTypeIdentifier>C </SimpleTypeIdentifier>& </CompositionTypeElement><CompositionTypeElement><SimpleTypeIdentifier>AnyObject </SimpleTypeIdentifier>& </CompositionTypeElement><CompositionTypeElement><SimpleTypeIdentifier>P </SimpleTypeIdentifier></CompositionTypeElement></CompositionType></ConstrainedSugarType></ReturnClause></FunctionSignature><CodeBlock>{}</CodeBlock></FunctionDecl><FunctionDecl><CustomAttribute>
 
 @<SimpleTypeIdentifier>custom</SimpleTypeIdentifier>(<TupleExprElement><IdentifierExpr>a</IdentifierExpr>, </TupleExprElement><TupleExprElement><IdentifierExpr>b</IdentifierExpr>,</TupleExprElement><TupleExprElement><IdentifierExpr>c</IdentifierExpr></TupleExprElement>)</CustomAttribute>
 func foo<FunctionSignature><ParameterClause>() </ParameterClause></FunctionSignature><CodeBlock>{}</CodeBlock></FunctionDecl><FunctionDecl><CustomAttribute>

test/Syntax/round_trip_tuple.swift renamed to test/Syntax/round_trip_types.swift

@@ -4,3 +4,9 @@ typealias TwoInts = (Int, Int)
 typealias TwoNamedInts = (a: Int, b: Int)
 typealias VoidTuple = ()
 typealias TupleWithTrivia = (   Int ,  b  :Int   )
+
+func testAnyType() {
+  protocol MyProto {}
+
+  let foo: [Int: any MyProto]
+}

utils/gyb_syntax_support/NodeSerializationCodes.py

@@ -232,7 +232,7 @@
     'NamedAttributeStringArgument': 227,
     'DeclName': 228,
     'PoundAssertStmt': 229,
-    'SomeType': 230,
+    'ConstrainedSugarType': 230,
     'CustomAttribute': 231,
     'GenericRequirement': 232,
     'DifferentiableAttributeArguments': 233,

utils/gyb_syntax_support/TypeNodes.py

@@ -77,12 +77,12 @@
              Child('QuestionMark', kind='PostfixQuestionMarkToken'),
          ]),
 
-    # some type -> some 'type'
-    Node('SomeType', kind='Type',
+    # constrained-sugar-type -> ('some'|'any') type
+    Node('ConstrainedSugarType', kind='Type',
          children=[
-             Child('SomeSpecifier', kind='IdentifierToken',
+             Child('SomeOrAnySpecifier', kind='IdentifierToken',
                    classification='Keyword',
-                   text_choices=['some']),
+                   text_choices=['some', 'any']),
              Child('BaseType', kind='Type'),
          ]),