Parse: Parse entire top level in one shot

Author: slavapestov

lib/Parse/ParseStmt.cpp

@@ -202,6 +202,8 @@ bool Parser::isTerminatorForBraceItemListKind(BraceItemListKind Kind,
                                               ArrayRef<ASTNode> ParsedDecls) {
   switch (Kind) {
   case BraceItemListKind::Brace:
+  case BraceItemListKind::TopLevelCode:
+  case BraceItemListKind::TopLevelLibrary:
     return false;
   case BraceItemListKind::Case: {
     if (Tok.is(tok::pound_if)) {
@@ -220,26 +222,6 @@ bool Parser::isTerminatorForBraceItemListKind(BraceItemListKind Kind,
     }
     return isAtStartOfSwitchCase(*this);
   }
-  case BraceItemListKind::TopLevelCode:
-    // When parsing the top level executable code for a module, if we parsed
-    // some executable code, then we're done.  We want to process (name bind,
-    // type check, etc) decls one at a time to make sure that there are not
-    // forward type references, etc.  There is an outer loop around the parser
-    // that will reinvoke the parser at the top level on each statement until
-    // EOF.  In contrast, it is ok to have forward references between classes,
-    // functions, etc.
-    for (auto I : ParsedDecls) {
-      if (isa<TopLevelCodeDecl>(I.get<Decl*>()))
-        // Only bail out if the next token is at the start of a line.  If we
-        // don't, then we may accidentally allow things like "a = 1 b = 4".
-        // FIXME: This is really dubious.  This will reject some things, but
-        // allow other things we don't want.
-        if (Tok.isAtStartOfLine())
-          return true;
-    }
-    return false;
-  case BraceItemListKind::TopLevelLibrary:
-    return false;
   case BraceItemListKind::ActiveConditionalBlock:
   case BraceItemListKind::InactiveConditionalBlock:
     return Tok.isNot(tok::pound_else) && Tok.isNot(tok::pound_endif) &&

test/Parse/confusables.swift

@@ -7,9 +7,9 @@
 let number⁚ Int // expected-note {{operator '⁚' contains possibly confused characters; did you mean to use ':'?}} {{11-14=:}}
 
 // expected-warning @+3 2 {{integer literal is unused}}
-// expected-error @+2 2 {{invalid character in source file}}
+// expected-error @+2 {{invalid character in source file}}
 // expected-error @+1 {{consecutive statements on a line must be separated by ';'}}
-5 ‒ 5 // expected-note 2 {{unicode character '‒' looks similar to '-'; did you mean to use '-'?}} {{3-6=-}}
+5 ‒ 5 // expected-note {{unicode character '‒' looks similar to '-'; did you mean to use '-'?}} {{3-6=-}}
 
 // expected-error @+2 {{use of unresolved identifier 'ꝸꝸꝸ'}}
 // expected-error @+1 {{expected ',' separator}}

test/Parse/identifiers.swift

@@ -26,7 +26,7 @@ func s̈pin̈al_tap̈() {}
 () // expected-error{{invalid character in source file}} {{1-4= }}
 
 // Placeholders are recognized as identifiers but with error.
-func <#some name#>() {} // expected-error 2 {{editor placeholder in source file}}
+func <#some name#>() {} // expected-error {{editor placeholder in source file}}
 
 // Keywords as identifiers
 class switch {} // expected-error {{keyword 'switch' cannot be used as an identifier here}} expected-note {{if this name is unavoidable, use backticks to escape it}} {{7-13=`switch`}}

test/Parse/recovery.swift

@@ -754,7 +754,7 @@ let curlyQuotes2 = “hello world!"
 
 
 // <rdar://problem/21196171> compiler should recover better from "unicode Specials" characters
-let tryx  = 123        // expected-error 2 {{invalid character in source file}}  {{5-8= }}
+let tryx  = 123        // expected-error {{invalid character in source file}}  {{5-8= }}
 
 
 // <rdar://problem/21369926> Malformed Swift Enums crash playground service