Merge pull request #15891 from rintaro/syntax-operator-selector

[Syntax] Parse 'operator' decl and '#selector' expr syntax.

Author: rintaro

lib/Parse/ParseDecl.cpp

@@ -2519,6 +2519,7 @@ Parser::parseDecl(ParseDeclOptions Flags,
     DeclResult = parseDeclDeinit(Flags, Attributes);
     break;
   case tok::kw_operator:
+    DeclParsingContext.setCreateSyntax(SyntaxKind::OperatorDecl);
     DeclResult = parseDeclOperator(Flags, Attributes);
     break;
   case tok::kw_precedencegroup:
@@ -6304,7 +6305,9 @@ Parser::parseDeclOperatorImpl(SourceLoc OperatorLoc, Identifier Name,
   SourceLoc colonLoc;
   Identifier precedenceGroupName;
   SourceLoc precedenceGroupNameLoc;
-  if (consumeIf(tok::colon, colonLoc)) {
+  if (Tok.is(tok::colon)) {
+    SyntaxParsingContext GroupCtxt(SyntaxContext, SyntaxKind::InfixOperatorGroup);
+    colonLoc = consumeToken();
     if (Tok.is(tok::identifier)) {
       precedenceGroupName = Context.getIdentifier(Tok.getText());
       precedenceGroupNameLoc = consumeToken(tok::identifier);

lib/Parse/ParseExpr.cpp

@@ -727,6 +727,7 @@ ParserResult<Expr> Parser::parseExprKeyPathObjC() {
 ///     '#selector' '(' 'setter' ':' expr ')'
 ///
 ParserResult<Expr> Parser::parseExprSelector() {
+  SyntaxParsingContext ExprCtxt(SyntaxContext, SyntaxKind::ObjcSelectorExpr);
   // Consume '#selector'.
   SourceLoc keywordLoc = consumeToken(tok::pound_selector);
 
@@ -750,7 +751,8 @@ ParserResult<Expr> Parser::parseExprSelector() {
     else
       selectorKind = ObjCSelectorExpr::Setter;
 
-    modifierLoc = consumeToken(tok::identifier);
+    Tok.setKind(tok::contextual_keyword);
+    modifierLoc = consumeToken();
     (void)consumeToken(tok::colon);
   } else {
     selectorKind = ObjCSelectorExpr::Method;

lib/Syntax/Status.md

@@ -43,8 +43,6 @@
   * IsExpr
   * AsExpr
   * ArrowExpr
-
-### Not-started (UnknownExpr):
   * ObjCSelectorExpr
 
 ## Declaration
@@ -67,13 +65,9 @@
   * DestructorDecl
   * EnumDecl
   * EnumCaseDecl
+  * OperatorDecl
   * PrecedenceGroupDecl
 
-### Not-started (UnknownDecl):
-  * InfixOperatorDecl
-  * PrefixOperatorDecl
-  * PostfixOperatorDecl
-
 ## Statement
 ### Done:
   * BraceStmt

test/Syntax/Outputs/round_trip_parse_gen.swift.withkinds

@@ -440,6 +440,15 @@ func keypath<FunctionSignature><ParameterClause>() </ParameterClause></FunctionS
   _ </DiscardAssignmentExpr><AssignmentExpr>= </AssignmentExpr><KeyPathExpr>\<MemberAccessExpr>.a.b</MemberAccessExpr></KeyPathExpr></SequenceExpr><SequenceExpr><DiscardAssignmentExpr>
   _ </DiscardAssignmentExpr><AssignmentExpr>= </AssignmentExpr><ObjcKeyPathExpr>#keyPath(<ObjcNamePiece>a.</ObjcNamePiece><ObjcNamePiece>b.</ObjcNamePiece><ObjcNamePiece>c</ObjcNamePiece>)</ObjcKeyPathExpr></SequenceExpr>
 }</CodeBlock></FunctionDecl><FunctionDecl>
+func objcSelector<FunctionSignature><ParameterClause>() </ParameterClause></FunctionSignature><CodeBlock>{<SequenceExpr><DiscardAssignmentExpr>
+  _ </DiscardAssignmentExpr><AssignmentExpr>= </AssignmentExpr><ArrayExpr>[<ArrayElement><ObjcSelectorExpr>
+    #selector(getter: <MemberAccessExpr><IdentifierExpr>Foo</IdentifierExpr>.bar</MemberAccessExpr>)</ObjcSelectorExpr>,</ArrayElement><ArrayElement><ObjcSelectorExpr>
+    #selector(setter: <MemberAccessExpr><MemberAccessExpr><IdentifierExpr>Foo</IdentifierExpr>.Bar</MemberAccessExpr>.baz</MemberAccessExpr>)</ObjcSelectorExpr>,</ArrayElement><ArrayElement><ObjcSelectorExpr>
+    #selector(<MemberAccessExpr><IdentifierExpr>Foo</IdentifierExpr>.method<DeclNameArguments>(<DeclNameArgument>x:</DeclNameArgument><DeclNameArgument>y:</DeclNameArgument>)</DeclNameArguments></MemberAccessExpr>)</ObjcSelectorExpr>,</ArrayElement><ArrayElement><ObjcSelectorExpr>
+    #selector(<FunctionCallExpr><MemberAccessExpr><SubscriptExpr><IdentifierExpr>foo</IdentifierExpr>[<FunctionCallArgument><IntegerLiteralExpr>42</IntegerLiteralExpr></FunctionCallArgument>]</SubscriptExpr>.bar</MemberAccessExpr>(<FunctionCallArgument><IdentifierExpr>x</IdentifierExpr></FunctionCallArgument>)</FunctionCallExpr>)</ObjcSelectorExpr>,</ArrayElement><ArrayElement><ObjcSelectorExpr>
+    #selector(<ClosureExpr>{ <ClosureSignature><ClosureCaptureSignature>[<ClosureCaptureItem><IdentifierExpr>x</IdentifierExpr></ClosureCaptureItem>] </ClosureCaptureSignature>in </ClosureSignature><ReturnStmt>return <NilLiteralExpr>nil </NilLiteralExpr></ReturnStmt>}</ClosureExpr>)</ObjcSelectorExpr></ArrayElement>
+  ]</ArrayExpr></SequenceExpr>
+}</CodeBlock></FunctionDecl><FunctionDecl>
 
 func objectLiterals<FunctionSignature><ParameterClause>() </ParameterClause></FunctionSignature><CodeBlock>{<ObjectLiteralExpr>
   #fileLiteral(<FunctionCallArgument><IdentifierExpr>a</IdentifierExpr></FunctionCallArgument>)</ObjectLiteralExpr><ObjectLiteralExpr>
@@ -472,4 +481,8 @@ precedencegroup BazPrecedence {<PrecedenceGroupAssociativity>
   assignment: true</PrecedenceGroupAssignment><PrecedenceGroupAssociativity>
   associativity: right</PrecedenceGroupAssociativity><PrecedenceGroupRelation>
   lowerThan: <PrecedenceGroupNameElement>DefaultPrecedence</PrecedenceGroupNameElement></PrecedenceGroupRelation>
-}</PrecedenceGroupDecl>
+}</PrecedenceGroupDecl><OperatorDecl><DeclModifier>
+
+infix </DeclModifier>operator<++><InfixOperatorGroup>:FooPrecedence</InfixOperatorGroup></OperatorDecl><OperatorDecl><DeclModifier>
+prefix </DeclModifier>operator..<<</OperatorDecl><OperatorDecl><DeclModifier>
+postfix </DeclModifier>operator <-</OperatorDecl>

test/Syntax/round_trip_parse_gen.swift

@@ -440,6 +440,15 @@ func keypath() {
   _ = \.a.b
   _ = #keyPath(a.b.c)
 }
+func objcSelector() {
+  _ = [
+    #selector(getter: Foo.bar),
+    #selector(setter: Foo.Bar.baz),
+    #selector(Foo.method(x:y:)),
+    #selector(foo[42].bar(x)),
+    #selector({ [x] in return nil })
+  ]
+}
 
 func objectLiterals() {
   #fileLiteral(a)
@@ -473,3 +482,7 @@ precedencegroup BazPrecedence {
   associativity: right
   lowerThan: DefaultPrecedence
 }
+
+infix operator<++>:FooPrecedence
+prefix operator..<<
+postfix operator <-

utils/gyb_syntax_support/DeclNodes.py

@@ -335,7 +335,6 @@
              Child('Identifier', kind='Token',
                    token_choices=[
                        'IdentifierToken',
-                       'OperatorToken',
                        'UnspacedBinaryOperatorToken',
                        'SpacedBinaryOperatorToken',
                        'PrefixOperatorToken',
@@ -592,6 +591,47 @@
                    ''')
          ]),
 
+    # operator-decl -> attribute? modifiers? 'operator' operator 
+    Node('OperatorDecl', kind='Decl', traits=['IdentifiedDecl'],
+         description='A Swift `operator` declaration.',
+         children=[
+             Child('Attributes', kind='AttributeList', is_optional=True,
+                   description='''
+                   The attributes applied to the 'operator' declaration.
+                   '''),
+             Child('Modifiers', kind='ModifierList', is_optional=True,
+                   description='''
+                   The declaration modifiers applied to the 'operator'
+                   declaration.
+                   '''),
+             Child('OperatorKeyword', kind='OperatorToken'),
+             Child('Identifier', kind='Token',
+                   token_choices=[
+                       'UnspacedBinaryOperatorToken',
+                       'SpacedBinaryOperatorToken',
+                       'PrefixOperatorToken',
+                       'PostfixOperatorToken',
+                   ]),
+             Child('InfixOperatorGroup', kind='InfixOperatorGroup',
+                   description='''
+                   Optionally specifiy a precedence group
+                   ''',
+                   is_optional=True),
+         ]),
+
+    # infix-operator-group -> ':' identifier
+    Node('InfixOperatorGroup', kind='Syntax',
+         description='''
+         A clause to specify precedence group in infix operator declaration.
+         ''',
+         children=[
+             Child('Colon', kind='ColonToken'),
+             Child('PrecedenceGroupName', kind='IdentifierToken',
+                   description='''
+                   The name of the precedence group for the operator
+                   '''),
+         ]),
+
     # precedence-group-decl -> attributes? modifiers? 'precedencegroup'
     #                            identifier '{' precedence-group-attribute-list
     #                            '}'

utils/gyb_syntax_support/ExprNodes.py

@@ -518,6 +518,21 @@
              Child('RightParen', kind='RightParenToken'),
          ]),
 
+    # e.g. "#selector(getter:Foo.bar)"
+    Node('ObjcSelectorExpr', kind='Expr',
+         traits=['Parenthesized'],
+         children=[
+             Child('PoundSelector', kind='PoundSelectorToken'),
+             Child('LeftParen', kind='LeftParenToken'),
+             Child('Kind', kind='ContextualKeywordToken',
+                   text_choices=['getter', 'setter'],
+                   is_optional=True),
+             Child('Colon', kind='ColonToken',
+                   is_optional=True),
+             Child('Name', kind='Expr'),
+             Child('RightParen', kind='RightParenToken'),
+         ]),
+
     # <#content#>
     Node('EditorPlaceholderExpr', kind='Expr',
          children=[