Merge pull request #3223 from CodaFi/it-will-be-an-inout-referendum

Author: swift-ci

lib/Parse/ParseType.cpp

@@ -467,10 +467,15 @@ ParserResult<TupleTypeRepr> Parser::parseTypeTupleBody() {
                                   /*AllowSepAfterLast=*/false,
                                   diag::expected_rparen_tuple_type_list,
                                   [&] () -> ParserStatus {
-    // If this is an inout marker in an argument list, consume the inout.
+    // If this is an deprecated use of the inout marker in an argument list,
+    // consume the inout.
     SourceLoc InOutLoc;
-    consumeIf(tok::kw_inout, InOutLoc);
-
+    bool hasAnyInOut = false;
+    bool hasValidInOut = false;
+    if (consumeIf(tok::kw_inout, InOutLoc)) {
+      hasAnyInOut = true;
+      hasValidInOut = false;
+    }
     // If the tuple element starts with "ident :", then
     // the identifier is an element tag, and it is followed by a type
     // annotation.
@@ -483,6 +488,18 @@ ParserResult<TupleTypeRepr> Parser::parseTypeTupleBody() {
 
       // Consume the ':'.
       consumeToken(tok::colon);
+      SourceLoc postColonLoc = Tok.getLoc();
+
+      // Consume 'inout' if present.
+      if (!hasAnyInOut && consumeIf(tok::kw_inout, InOutLoc)) {
+        hasValidInOut = true;
+      }
+
+      SourceLoc extraneousInOutLoc;
+      while (consumeIf(tok::kw_inout, extraneousInOutLoc)) {
+        diagnose(Tok.getLoc(), diag::parameter_inout_var_let_repeated)
+          .fixItRemove(extraneousInOutLoc);
+      }
 
       // Parse the type annotation.
       ParserResult<TypeRepr> type = parseType(diag::expected_type);
@@ -491,13 +508,18 @@ ParserResult<TupleTypeRepr> Parser::parseTypeTupleBody() {
       if (type.isNull())
         return makeParserError();
 
+      if (!hasValidInOut && hasAnyInOut) {
+        diagnose(Tok.getLoc(), diag::inout_as_attr_disallowed)
+          .fixItRemove(InOutLoc)
+          .fixItInsert(postColonLoc, "inout ");
+      }
+
       // If an 'inout' marker was specified, build the type.  Note that we bury
       // the inout locator within the named locator.  This is weird but required
       // by sema apparently.
       if (InOutLoc.isValid())
         type = makeParserResult(new (Context) InOutTypeRepr(type.get(),
                                                             InOutLoc));
-
 
       ElementsR.push_back(
           new (Context) NamedTypeRepr(name, type.get(), nameLoc));

test/Parse/invalid.swift

@@ -12,6 +12,7 @@ func test1(inout var x : Int) {}  // expected-error {{parameter may not have mul
 // expected-error @-1 {{'inout' before a parameter name is not allowed, place it before the parameter type instead}} {{12-17=}} {{26-26=inout }}
 func test2(inout let x : Int) {}  // expected-error {{parameter may not have multiple 'inout', 'var', or 'let' specifiers}} {{18-22=}}
 // expected-error @-1 {{'inout' before a parameter name is not allowed, place it before the parameter type instead}} {{12-17=}} {{26-26=inout }}
+func test3(f : (inout x : Int) -> Void) {} // expected-error {{'inout' before a parameter name is not allowed, place it before the parameter type instead}}
 
 func test3() {
   undeclared_func( // expected-error {{use of unresolved identifier 'undeclared_func'}} expected-note {{to match this opening '('}} expected-error {{expected ',' separator}} {{19-19=,}}
@@ -69,8 +70,8 @@ SR698(1, b: 2,) // expected-error {{unexpected ',' separator}}
 
 // SR-979 - Two inout crash compiler
 func SR979a(a : inout inout Int) {}  // expected-error {{parameter may not have multiple 'inout', 'var', or 'let' specifiers}} {{17-23=}}
-func SR979b(inout inout b: Int) {}  // expected-error {{parameter may not have multiple 'inout', 'var', or 'let' specifiers}} {{19-25=}}
-// expected-error @-1 {{'inout' before a parameter name is not allowed, place it before the parameter type instead}} {{13-18=}} {{28-28=inout }}
+func SR979b(inout inout b: Int) {} // expected-error {{inout' before a parameter name is not allowed, place it before the parameter type instead}} {{13-18=}} {{28-28=inout }} 
+// expected-error@-1 {{parameter may not have multiple 'inout', 'var', or 'let' specifiers}} {{19-25=}}
 func SR979c(let a: inout Int) {}	 // expected-error {{parameter may not have multiple 'inout', 'var', or 'let' specifiers}} {{13-16=}} 
 // expected-error @-1 {{'let' as a parameter attribute is not allowed}} {{13-16=}}
 func SR979d(let let a: Int) {}  // expected-error {{'let' as a parameter attribute is not allowed}} {{13-16=}} 
@@ -80,6 +81,7 @@ func SR979f(var inout x : Int) { // expected-error {{parameter may not have mult
 // expected-error @-1 {{parameters may not have the 'var' specifier}} {{13-16=}}{{3-3=var x = x\n  }} 
   x += 10
 }
+func SR979g(inout i: inout Int) {} // expected-error {{parameter may not have multiple 'inout', 'var', or 'let' specifiers}} {{13-18=}}
 func SR979h(let inout x : Int) {}  // expected-error {{parameter may not have multiple 'inout', 'var', or 'let' specifiers}} {{17-23=}}
 // expected-error @-1 {{'let' as a parameter attribute is not allowed}}
 class VarTester {