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/parser: removed TODO (cleanup)

Browse source 
- checking for the correct closing token leads to slightly better
  behavior for some randomly bogus programs
- removed `switch` in favor of an `if` statement

Follow-up on https://go-review.googlesource.com/c/go/+/71250.

Change-Id: I47f6c47b43baf790907f55ed97a947661687a9db
Reviewed-on: https://go-review.googlesource.com/71252
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
This commit is contained in:
griesemer 2017-10-16 18:01:47 -07:00 • committed by Robert Griesemer
parent 3be5d55180
commit 4fe43f8146
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -368,17 +368,12 @@ func (p *parser) list(open, sep, close token, f func() bool) src.Pos {
var done bool var done bool
for p.tok != _EOF && p.tok != close && !done { for p.tok != _EOF && p.tok != close && !done {
done = f() done = f()
switch p.tok { // sep is optional before close
case sep: if !p.got(sep) && p.tok != close {
p.next()
case _Rparen, _Rbrace:
// comma is optional before ) or } - nothing to do
// TODO(gri): consider restricting this case
// to the expected close token only
default:
p.syntax_error(fmt.Sprintf("expecting %s or %s", tokstring(sep), tokstring(close))) p.syntax_error(fmt.Sprintf("expecting %s or %s", tokstring(sep), tokstring(close)))
p.advance(_Rparen, _Rbrack, _Rbrace) p.advance(_Rparen, _Rbrack, _Rbrace)
if p.tok != close { if p.tok != close {
// position could be better but we had an error so we don't care
return p.pos() return p.pos()
} }
} }
@ -386,7 +381,6 @@ func (p *parser) list(open, sep, close token, f func() bool) src.Pos {
pos := p.pos() pos := p.pos()
p.want(close) p.want(close)
return pos return pos
} }