languages/go
languages/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-07-20 06:47:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmd/compile/internal/syntax: generalize error about var decls in init clauses

Browse source 
Change-Id: I62f9748b97bec245338ebf9686fbf6ad6dc6a9c2
Reviewed-on: https://go-review.googlesource.com/36931
Run-TryBot: Robert Griesemer <gri@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
This commit is contained in:
Robert Griesemer 2017-02-13 15:08:04 -08:00
parent f823d30514
commit efb3cab960
3 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1703,8 +1703,8 @@ func (p *parser) header(keyword token) (init SimpleStmt, cond Expr, post SimpleS
if p.tok != _Semi {
// accept potential varDecl but complain
if keyword == _For && p.got(_Var) {
p.syntax_error("var declaration not allowed in for initializer")
if p.got(_Var) {
p.syntax_error(fmt.Sprintf("var declaration not allowed in %s initializer", keyword.String()))
}
init = p.simpleStmt(nil, keyword == _For)
// If we have a range clause, we are done (can only happen for keyword == _For).

11
test/syntax/forvar.go
View file

@ -1,11 +0,0 @@
// errorcheck
// Copyright 2010 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package main
func main() {
var x int // avoid undefined: x error below with recursive-descent parser
for var x = 0; x < 10; x++ { // ERROR "var declaration not allowed in for initializer"

15
test/syntax/initvar.go Normal file
View file

@ -0,0 +1,15 @@
// errorcheck
// Copyright 2010 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package main
func main() {
if var x = 0; x < 10 {} // ERROR "var declaration not allowed in if initializer"
switch var x = 0; x {} // ERROR "var declaration not allowed in switch initializer"
for var x = 0; x < 10; {} // ERROR "var declaration not allowed in for initializer"
}