Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Don't skip closing parentheses of any kind after a missing
expression. They are likely part of the lexical construct
enclosing the expression.

Fixes #33386.

Change-Id: Ic0abc2037ec339a345ec357ccc724b7ad2a64c00
Reviewed-on: https://go-review.googlesource.com/c/go/+/188502
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
This commit is contained in:
Robert Griesemer 2019-08-01 11:45:21 -07:00
parent 1a423bec00
commit dca0d03b9c
2 changed files with 33 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/cmd/compile/internal/syntax/parser.go
View file

@ -869,7 +869,7 @@ func (p *parser) operand(keep_parens bool) Expr {
default:
x := p.bad()
p.syntaxError("expecting expression")
p.advance()
p.advance(_Rparen, _Rbrack, _Rbrace)
return x
}
@ -1840,6 +1840,9 @@ func (p *parser) header(keyword token) (init SimpleStmt, cond Expr, post SimpleS
} else {
// asking for a '{' rather than a ';' here leads to a better error message
p.want(_Lbrace)
if p.tok != _Lbrace {
p.advance(_Lbrace, _Rbrace) // for better synchronization (e.g., issue #22581)
}
}
if keyword == _For {
if p.tok != _Semi {