diff options
| author | Robert Griesemer <gri@golang.org> | 2015-09-14 12:01:04 -0700 |
|---|---|---|
| committer | Robert Griesemer <gri@golang.org> | 2015-09-14 23:37:18 +0000 |
| commit | 8fab2929dd97b8fb8fe1837b886115e24e814572 (patch) | |
| tree | b2741a0b0bd053dd190f394fc4d7ab87cc0fdcf0 | |
| parent | ffd7d31787c7d08f61fc31feef154f0e8627bd44 (diff) | |
| download | go-git-8fab2929dd97b8fb8fe1837b886115e24e814572.tar.gz | |
go/parser: better error message for unexpected ',' in struct type
Fixes #12437.
Change-Id: I5463970a6259527003eb0e12903a338cc78e0683
Reviewed-on: https://go-review.googlesource.com/14564
Reviewed-by: Chris Manghane <cmang@golang.org>
| -rw-r--r-- | src/go/parser/parser.go | 9 | ||||
| -rw-r--r-- | src/go/parser/short_test.go | 12 |
2 files changed, 14 insertions, 7 deletions
diff --git a/src/go/parser/parser.go b/src/go/parser/parser.go index e82c0bd122..855caa3daa 100644 --- a/src/go/parser/parser.go +++ b/src/go/parser/parser.go @@ -410,9 +410,14 @@ func (p *parser) expectClosing(tok token.Token, context string) token.Pos { func (p *parser) expectSemi() { // semicolon is optional before a closing ')' or '}' if p.tok != token.RPAREN && p.tok != token.RBRACE { - if p.tok == token.SEMICOLON { + switch p.tok { + case token.COMMA: + // permit a ',' instead of a ';' but complain + p.errorExpected(p.pos, "';'") + fallthrough + case token.SEMICOLON: p.next() - } else { + default: p.errorExpected(p.pos, "';'") syncStmt(p) } diff --git a/src/go/parser/short_test.go b/src/go/parser/short_test.go index ef2ffadbd9..7cbdaf2e24 100644 --- a/src/go/parser/short_test.go +++ b/src/go/parser/short_test.go @@ -101,11 +101,13 @@ var invalids = []string{ `package p; func f() { defer func() {} /* ERROR HERE "function must be invoked" */ }`, `package p; func f() { go func() { func() { f(x func /* ERROR "missing ','" */ (){}) } } }`, `package p; func f(x func(), u v func /* ERROR "missing ','" */ ()){}`, - `package p; func f() (a b string /* ERROR "missing ','" */ , ok bool)`, // issue 8656 - `package p; var x /* ERROR "missing variable type or initialization" */ , y, z;`, // issue 9639 - `package p; const x /* ERROR "missing constant value" */ ;`, // issue 9639 - `package p; const x /* ERROR "missing constant value" */ int;`, // issue 9639 - `package p; const (x = 0; y; z /* ERROR "missing constant value" */ int);`, // issue 9639 + `package p; func f() (a b string /* ERROR "missing ','" */ , ok bool)`, // issue 8656 + `package p; var x /* ERROR "missing variable type or initialization" */ , y, z;`, // issue 9639 + `package p; const x /* ERROR "missing constant value" */ ;`, // issue 9639 + `package p; const x /* ERROR "missing constant value" */ int;`, // issue 9639 + `package p; const (x = 0; y; z /* ERROR "missing constant value" */ int);`, // issue 9639 + `package p; var _ = struct { x int, /* ERROR "expected ';', found ','" */ }{}`, // issue 12437 + `package p; var _ = struct { x int, /* ERROR "expected ';', found ','" */ y float }{}`, // issue 12437 } func TestInvalid(t *testing.T) { |