From: Robert Griesemer <gri@golang.org>
Date: Wed, 17 Jan 2018 01:00:51 +0000 (-0800)
Subject: cmd/compile/internal/syntax: better error recovery after missing type
X-Git-Tag: go1.11beta1~1726
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=670494827c42d4ac64a52dfa909cf6048308e133;p=gostls13.git

cmd/compile/internal/syntax: better error recovery after missing type

R=go1.11.

This is just a copy of the fix for #23434:
https://go-review.googlesource.com/c/go/+/87898.

Test pending test harness for the syntax package.

Change-Id: I52409aebe13ec784ddd7e41190a81c7e126bdd0c
Reviewed-on: https://go-review.googlesource.com/87901
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
---

diff --git a/src/cmd/compile/internal/syntax/parser.go b/src/cmd/compile/internal/syntax/parser.go
index d01ad6056e..0a872e03ef 100644
--- a/src/cmd/compile/internal/syntax/parser.go
+++ b/src/cmd/compile/internal/syntax/parser.go
@@ -1036,7 +1036,7 @@ func (p *parser) type_() Expr {
 	if typ == nil {
 		typ = p.bad()
 		p.syntax_error("expecting type")
-		p.advance()
+		p.advance(_Comma, _Colon, _Semi, _Rparen, _Rbrack, _Rbrace)
 	}
 
 	return typ