diff options
| author | Robert Griesemer <gri@golang.org> | 2019-08-01 11:45:21 -0700 |
|---|---|---|
| committer | Robert Griesemer <gri@golang.org> | 2019-08-27 15:46:41 +0000 |
| commit | dca0d03b9c9ad20de743bd8ac4cd4b2b466713a3 (patch) | |
| tree | 841d82083cd8e036dc061ca709c8597cb4ed4782 /src/cmd/compile/internal/syntax/parser.go | |
| parent | 1a423bec00915fd45dc6f7ee67860abbfc2bbdb2 (diff) | |
| download | go-dca0d03b9c9ad20de743bd8ac4cd4b2b466713a3.tar.xz | |
cmd/compile/internal/syntax: better error recovery after missing expression
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>
Diffstat (limited to 'src/cmd/compile/internal/syntax/parser.go')
| -rw-r--r-- | src/cmd/compile/internal/syntax/parser.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/cmd/compile/internal/syntax/parser.go b/src/cmd/compile/internal/syntax/parser.go index d4e9bf2f96..6ad1e5b9a5 100644 --- a/src/cmd/compile/internal/syntax/parser.go +++ b/src/cmd/compile/internal/syntax/parser.go @@ -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 { |