close_issue_1
/
tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

go/types: permit "for range x" 

LGTM=adonovan
R=adonovan
CC=golang-codereviews
https://golang.org/cl/110630044
This commit is contained in:
Robert Griesemer 2014-07-15 08:54:09 -07:00
parent bbb1c45ba5
commit e078800d1f
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
go/types/stmt.go
View File

@ -656,10 +656,6 @@ func (check *Checker) stmt(ctxt stmtContext, s ast.Stmt) {
// check assignment to/declaration of iteration variables // check assignment to/declaration of iteration variables
// (irregular assignment, cannot easily map to existing assignment checks) // (irregular assignment, cannot easily map to existing assignment checks)
if s.Key == nil {
check.invalidAST(s.Pos(), "range clause requires index iteration variable")
// ok to continue
}
// lhs expressions and initialization value (rhs) types // lhs expressions and initialization value (rhs) types
lhs := [2]ast.Expr{s.Key, s.Value} lhs := [2]ast.Expr{s.Key, s.Value}
@ -701,7 +697,7 @@ func (check *Checker) stmt(ctxt stmtContext, s ast.Stmt) {
// declare variables // declare variables
if len(vars) > 0 { if len(vars) > 0 {
for _, obj := range vars { for _, obj := range vars {
check.declare(check.scope, nil, obj) // recordObject already called check.declare(check.scope, nil /* recordDef already called */, obj)
} }
} else { } else {
check.error(s.TokPos, "no new variables on left side of :=") check.error(s.TokPos, "no new variables on left side of :=")

10
go/types/testdata/stmt0.src vendored
View File

@ -631,9 +631,11 @@ func rangeloops1() {
rc <-chan int rc <-chan int
) )
for range x /* ERROR "cannot range over" */ {}
for _ = range x /* ERROR "cannot range over" */ {} for _ = range x /* ERROR "cannot range over" */ {}
for i := range x /* ERROR "cannot range over" */ {} for i := range x /* ERROR "cannot range over" */ {}
for range a {}
for i := range a { for i := range a {
var ii int var ii int
ii = i ii = i
@ -652,6 +654,7 @@ func rangeloops1() {
for ii, xx = range a {} for ii, xx = range a {}
_, _ = ii, xx _, _ = ii, xx
for range b {}
for i := range b { for i := range b {
var ii int var ii int
ii = i ii = i
@ -666,6 +669,7 @@ func rangeloops1() {
_ = xx _ = xx
} }
for range s {}
for i := range s { for i := range s {
var ii int var ii int
ii = i ii = i
@ -680,14 +684,17 @@ func rangeloops1() {
_ = xx _ = xx
} }
for range p {}
for _, x := range p { for _, x := range p {
var xx complex128 var xx complex128
xx = x xx = x
_ = xx _ = xx
} }
for range pp /* ERROR "cannot range over" */ {}
for _, x := range pp /* ERROR "cannot range over" */ {} for _, x := range pp /* ERROR "cannot range over" */ {}
for range m {}
for k := range m { for k := range m {
var kk int32 var kk int32
kk = k /* ERROR "cannot assign" */ kk = k /* ERROR "cannot assign" */
@ -700,6 +707,7 @@ func rangeloops1() {
if v {} if v {}
} }
for range c {}
for _, _ /* ERROR "only one iteration variable" */ = range c {} for _, _ /* ERROR "only one iteration variable" */ = range c {}
for e := range c { for e := range c {
var ee int var ee int
@ -711,6 +719,8 @@ func rangeloops1() {
// constant strings // constant strings
const cs = "foo" const cs = "foo"
for range cs {}
for range "" {}
for i, x := range cs { _, _ = i, x } for i, x := range cs { _, _ = i, x }
for i, x := range "" { for i, x := range "" {
var ii int var ii int