Followup to r19830: preserve the original token so we report the

correct location for the operator error, and added a test for the
error reporting for operators in non-global scopes.


Swift SVN r19862

Author: jimingham

lib/Parse/ParseDecl.cpp

@@ -3043,6 +3043,7 @@ Parser::parseDeclFunc(SourceLoc StaticLoc, StaticSpellingKind StaticSpelling,
   }
   Identifier SimpleName;
   SourceLoc NameLoc = Tok.getLoc();
+  Token NonglobalTok = Tok;
   bool  NonglobalError = false;
 
   if (!(Flags & PD_AllowTopLevel) && 
@@ -3067,7 +3068,7 @@ Parser::parseDeclFunc(SourceLoc StaticLoc, StaticSpellingKind StaticSpelling,
 
   if (NonglobalError && !DCC.movedToTopLevel()) {
     // FIXME: Recovery here is awful.
-    diagnose(Tok, diag::func_decl_nonglobal_operator);
+    diagnose(NonglobalTok, diag::func_decl_nonglobal_operator);
     return nullptr;
   }
 

test/decl/operator/operators.swift

@@ -144,3 +144,9 @@ func test_14705150() {
 operator postfix! {} // expected-error{{cannot declare a custom postfix '!' operator}}
 @postfix func !(x: Int) { } // expected-error{{cannot declare a custom postfix '!' operator}}
 @postfix func!(x: Int8) { } // expected-error{{cannot declare a custom postfix '!' operator}}
+
+// Only allow operators at global scope:
+func operator_in_func_bad () {
+    @prefix func + (input: String) -> String { return "+" + input } // expected-error {{operators are only allowed at global scope}} \
+                                                                    // expected-error {{braced block of statements is an unused closure}}
+}