qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 18:00:06 -07:00
Code Releases Activity

go/parser: better error message for missing ',' in lists

Browse Source 
Fixes #8940.

Change-Id: Ie9e5149983518ba8d56ddd82ac8f4cde6b644167
Reviewed-on: https://go-review.googlesource.com/10089
Reviewed-by: Alan Donovan <adonovan@google.com>
This commit is contained in:
Robert Griesemer 2015-05-14 16:47:53 -07:00
parent 1467776b17
commit 40fad6c286
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/go/parser/parser.go
View File

@ -412,14 +412,17 @@ func (p *parser) expectSemi() {
} }
} }
func (p *parser) atComma(context string) bool { func (p *parser) atComma(context string, follow token.Token) bool {
if p.tok == token.COMMA { if p.tok == token.COMMA {
return true return true
} }
if p.tok == token.SEMICOLON && p.lit == "\n" { if p.tok != follow {
p.error(p.pos, "missing ',' before newline in "+context) msg := "missing ','"
return true // "insert" the comma and continue if p.tok == token.SEMICOLON && p.lit == "\n" {
msg += " before newline"
}
p.error(p.pos, msg+" in "+context)
return true // "insert" comma and continue
} }
return false return false
} }
@ -825,7 +828,7 @@ func (p *parser) parseParameterList(scope *ast.Scope, ellipsisOk bool) (params [
// parameter or result variable is the function body. // parameter or result variable is the function body.
p.declare(field, nil, scope, ast.Var, idents...) p.declare(field, nil, scope, ast.Var, idents...)
p.resolve(typ) p.resolve(typ)
if !p.atComma("parameter list") { if !p.atComma("parameter list", token.RPAREN) {
return return
} }
p.next() p.next()
@ -838,7 +841,7 @@ func (p *parser) parseParameterList(scope *ast.Scope, ellipsisOk bool) (params [
// parameter or result variable is the function body. // parameter or result variable is the function body.
p.declare(field, nil, scope, ast.Var, idents...) p.declare(field, nil, scope, ast.Var, idents...)
p.resolve(typ) p.resolve(typ)
if !p.atComma("parameter list") { if !p.atComma("parameter list", token.RPAREN) {
break break
} }
p.next() p.next()
@ -1248,7 +1251,7 @@ func (p *parser) parseCallOrConversion(fun ast.Expr) *ast.CallExpr {
ellipsis = p.pos ellipsis = p.pos
p.next() p.next()
} }
if !p.atComma("argument list") { if !p.atComma("argument list", token.RPAREN) {
break break
} }
p.next() p.next()
@ -1323,7 +1326,7 @@ func (p *parser) parseElementList() (list []ast.Expr) {
for p.tok != token.RBRACE && p.tok != token.EOF { for p.tok != token.RBRACE && p.tok != token.EOF {
list = append(list, p.parseElement()) list = append(list, p.parseElement())
if !p.atComma("composite literal") { if !p.atComma("composite literal", token.RBRACE) {
break break
} }
p.next() p.next()

5
src/go/parser/short_test.go
View File

@ -99,8 +99,9 @@ var invalids = []string{
`package p; func f() { for i /* ERROR "boolean or range expression" */ , x := []string {} }`, `package p; func f() { for i /* ERROR "boolean or range expression" */ , x := []string {} }`,
`package p; func f() { go f /* ERROR HERE "function must be invoked" */ }`, `package p; func f() { go f /* ERROR HERE "function must be invoked" */ }`,
`package p; func f() { defer func() {} /* ERROR HERE "function must be invoked" */ }`, `package p; func f() { defer func() {} /* ERROR HERE "function must be invoked" */ }`,
`package p; func f() { go func() { func() { f(x func /* ERROR "expected '\)'" */ (){}) } } }`, `package p; func f() { go func() { func() { f(x func /* ERROR "missing ','" */ (){}) } } }`,
`package p; func f() (a b string /* ERROR "expected '\)'" */ , ok bool)`, // issue 8656 `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; 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" */ ;`, // issue 9639
`package p; const x /* ERROR "missing constant value" */ int;`, // issue 9639 `package p; const x /* ERROR "missing constant value" */ int;`, // issue 9639