Merge pull request #955 from dduan/SR-510-2

[SR-510][Parser] complain for invalid enum raw value

Author: lattner

lib/Parse/ParseDecl.cpp

@@ -4398,6 +4398,7 @@ ParserStatus Parser::parseDeclEnumCase(ParseDeclOptions Flags,
 
     // See if there's a raw value expression.
     SourceLoc EqualsLoc;
+    auto NextLoc = peekToken().getLoc();
     ParserResult<Expr> RawValueExpr;
     LiteralExpr *LiteralRawValueExpr = nullptr;
     if (Tok.is(tok::equal)) {
@@ -4412,6 +4413,7 @@ ParserStatus Parser::parseDeclEnumCase(ParseDeclOptions Flags,
         return Status;
       }
       if (RawValueExpr.isNull()) {
+        diagnose(NextLoc, diag::nonliteral_enum_case_raw_value);
         Status.setIsParseError();
         return Status;
       }

test/decl/enum/enumtest.swift

@@ -290,5 +290,9 @@ func testSimpleEnum() {
   let _ : SimpleEnum=.X    // expected-error {{'=' must have consistent whitespace on both sides}}
 }
 
+enum SR510: String {
+    case Thing = "thing"
+    case Bob = {"test"} // expected-error {{not a proper raw value expression}}
+}