Merge pull request #3229 from ahoppen/SR-1827-change-syntax

Make #selector a primary expression

Author: slavapestov

lib/Parse/ParseExpr.cpp

@@ -480,7 +480,6 @@ ParserResult<Expr> Parser::parseExprSequenceElement(Diag<> message,
 ///     expr-postfix(Mode)
 ///     operator-prefix expr-unary(Mode)
 ///     '&' expr-unary(Mode)
-///     expr-selector
 ///
 ParserResult<Expr> Parser::parseExprUnary(Diag<> Message, bool isExprBasic) {
   UnresolvedDeclRefExpr *Operator;
@@ -504,9 +503,6 @@ ParserResult<Expr> Parser::parseExprUnary(Diag<> Message, bool isExprBasic) {
   case tok::pound_keyPath:
     return parseExprKeyPath();
 
-  case tok::pound_selector:
-    return parseExprSelector();
-
   case tok::oper_postfix:
     // Postfix operators cannot start a subexpression, but can happen
     // syntactically because the operator may just follow whatever precedes this
@@ -1030,6 +1026,7 @@ getMagicIdentifierLiteralKind(tok Kind) {
 ///     expr-paren
 ///     expr-super
 ///     expr-discard
+///     expr-selector
 ///
 ///   expr-delayed-identifier:
 ///     '.' identifier
@@ -1191,6 +1188,10 @@ ParserResult<Expr> Parser::parseExprPostfix(Diag<> ID, bool isExprBasic) {
       new (Context) DiscardAssignmentExpr(consumeToken(), /*Implicit=*/false));
     break;
 
+  case tok::pound_selector: // expr-selector
+    Result = parseExprSelector();
+    break;
+
   case tok::l_brace:     // expr-closure
     Result = parseExprClosure();
     break;

test/Inputs/clang-importer-sdk/swift-modules/ObjectiveC.swift

@@ -63,6 +63,12 @@ public struct Selector : StringLiteralConvertible {
   }
 }
 
+extension Selector : Equatable {}
+
+public func ==(lhs: Selector, rhs: Selector) -> Bool {
+  return sel_isEqual(lhs, rhs)
+}
+
 public struct NSZone {
   public var pointer : OpaquePointer
 }

test/Inputs/clang-importer-sdk/usr/include/objc/objc.h

@@ -16,6 +16,7 @@ typedef __typeof__(__objc_yes) BOOL;
 
 typedef struct objc_selector    *SEL;
 SEL sel_registerName(const char *str);
+BOOL sel_isEqual(SEL sel1, SEL sel2);
 
 void NSDeallocateObject(id object) NS_AUTOMATED_REFCOUNT_UNAVAILABLE;
 

test/expr/unary/selector/selector.swift

@@ -111,3 +111,12 @@ func testParseErrors4() {
   // Subscripts
   _ = #selector(C1.subscript) // expected-error{{type 'C1.Type' has no subscript members}}
 }
+
+// SR-1827
+
+let optionalSel: Selector? = nil
+
+switch optionalSel {
+case #selector(C1.method1)?:
+  break
+}