Handle presence of illegal semicolon after package clause better.

R=r, r1
https://golang.org/cl/157167

diff --git a/src/pkg/go/parser/parser.go b/src/pkg/go/parser/parser.go
index f51d3fab799b1bbf9905812432702ab956db210d..8af1b801e05376296830d064624fb67a91cb4a1a 100644 (file)
--- a/src/pkg/go/parser/parser.go
+++ b/src/pkg/go/parser/parser.go
@@ -1977,6 +1977,14 @@ func (p *parser) parseFile() *ast.File {
        doc := p.leadComment;
        pos := p.expect(token.PACKAGE);
        ident := p.parseIdent();
+
+       // Common error: semicolon after package clause.
+       // Accept and report it for better error synchronization.
+       if p.tok == token.SEMICOLON {
+               p.Error(p.pos, "expected declaration, found ';'");
+               p.next();
+       }
+
        var decls []ast.Decl;
 
        // Don't bother parsing the rest if we had errors already.