all: rename GOEXPERIMENT=range to rangefunc

Range over integer is enabled now without the GOEXPERIMENT. The
GOEXPERIMENT is only for range over func. Rename it to rangefunc.

For #61405.

Change-Id: I9405fb8e2e30827875716786823856090a1a0cad
Reviewed-on: https://go-review.googlesource.com/c/go/+/539277
Reviewed-by: Russ Cox <rsc@golang.org>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>

diff --git a/src/cmd/compile/internal/types2/check_test.go b/src/cmd/compile/internal/types2/check_test.go
index 791d9f028c19955eaf51326fd900d3fab5dd4935..d70d7e32321a96bb41a10c0b4d92594afdd90aaa 100644 (file)
--- a/src/cmd/compile/internal/types2/check_test.go
+++ b/src/cmd/compile/internal/types2/check_test.go
@@ -368,11 +368,11 @@ func TestIssue47243_TypedRHS(t *testing.T) {
 }
 
 func TestCheck(t *testing.T) {
-       old := buildcfg.Experiment.Range
+       old := buildcfg.Experiment.RangeFunc
        defer func() {
-               buildcfg.Experiment.Range = old
+               buildcfg.Experiment.RangeFunc = old
        }()
-       buildcfg.Experiment.Range = true
+       buildcfg.Experiment.RangeFunc = true
 
        DefPredeclaredTestFuncs()
        testDirFiles(t, "../../../../internal/types/testdata/check", 50, false) // TODO(gri) narrow column tolerance

diff --git a/src/cmd/compile/internal/types2/stmt.go b/src/cmd/compile/internal/types2/stmt.go
index fc13e9890fd7f810a0732555d69305218e8b1022..e4bda49c52f35bd46e57c4455de5c97fdfc6a205 100644 (file)
--- a/src/cmd/compile/internal/types2/stmt.go
+++ b/src/cmd/compile/internal/types2/stmt.go
@@ -1009,7 +1009,7 @@ func rangeKeyVal(typ Type) (key, val Type, cause string, isFunc, ok bool) {
                }
                return typ.elem, nil, "", false, true
        case *Signature:
-               if !buildcfg.Experiment.Range {
+               if !buildcfg.Experiment.RangeFunc {
                        break
                }
                assert(typ.Recv() == nil)

diff --git a/src/go/types/check_test.go b/src/go/types/check_test.go
index 451e4be9bf2295ca0859bb7833924c5a5c1aeb15..ffad095244cc1ec7aab341f27da1cae7b7f7abe0 100644 (file)
--- a/src/go/types/check_test.go
+++ b/src/go/types/check_test.go
@@ -396,11 +396,11 @@ func TestIssue47243_TypedRHS(t *testing.T) {
 }
 
 func TestCheck(t *testing.T) {
-       old := buildcfg.Experiment.Range
+       old := buildcfg.Experiment.RangeFunc
        defer func() {
-               buildcfg.Experiment.Range = old
+               buildcfg.Experiment.RangeFunc = old
        }()
-       buildcfg.Experiment.Range = true
+       buildcfg.Experiment.RangeFunc = true
 
        DefPredeclaredTestFuncs()
        testDirFiles(t, "../../internal/types/testdata/check", false)

diff --git a/src/go/types/stmt.go b/src/go/types/stmt.go
index 5363bb9870da3871c4fded368191c9443c2abedd..7a3bcf029be89a7f9c32c9d591fffbfd452c3775 100644 (file)
--- a/src/go/types/stmt.go
+++ b/src/go/types/stmt.go
@@ -994,7 +994,7 @@ func rangeKeyVal(typ Type) (key, val Type, cause string, isFunc, ok bool) {
                }
                return typ.elem, nil, "", false, true
        case *Signature:
-               if !buildcfg.Experiment.Range {
+               if !buildcfg.Experiment.RangeFunc {
                        break
                }
                assert(typ.Recv() == nil)

diff --git a/src/internal/goexperiment/exp_range_off.go b/src/internal/goexperiment/exp_range_off.go
deleted file mode 100644 (file)
index 82f5dc7..0000000
--- a/src/internal/goexperiment/exp_range_off.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// Code generated by mkconsts.go. DO NOT EDIT.
-
-//go:build !goexperiment.range
-
-package goexperiment
-
-const Range = false
-const RangeInt = 0

diff --git a/src/internal/goexperiment/exp_range_on.go b/src/internal/goexperiment/exp_range_on.go
deleted file mode 100644 (file)
index 1d0f30f..0000000
--- a/src/internal/goexperiment/exp_range_on.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// Code generated by mkconsts.go. DO NOT EDIT.
-
-//go:build goexperiment.range
-
-package goexperiment
-
-const Range = true
-const RangeInt = 1

diff --git a/src/internal/goexperiment/exp_rangefunc_off.go b/src/internal/goexperiment/exp_rangefunc_off.go
new file mode 100644 (file)
index 0000000..fc02820
--- /dev/null
+++ b/src/internal/goexperiment/exp_rangefunc_off.go
@@ -0,0 +1,8 @@
+// Code generated by mkconsts.go. DO NOT EDIT.
+
+//go:build !goexperiment.rangefunc
+
+package goexperiment
+
+const RangeFunc = false
+const RangeFuncInt = 0

diff --git a/src/internal/goexperiment/exp_rangefunc_on.go b/src/internal/goexperiment/exp_rangefunc_on.go
new file mode 100644 (file)
index 0000000..25e7bd3
--- /dev/null
+++ b/src/internal/goexperiment/exp_rangefunc_on.go
@@ -0,0 +1,8 @@
+// Code generated by mkconsts.go. DO NOT EDIT.
+
+//go:build goexperiment.rangefunc
+
+package goexperiment
+
+const RangeFunc = true
+const RangeFuncInt = 1

diff --git a/src/internal/goexperiment/flags.go b/src/internal/goexperiment/flags.go
index c43c5d0323afe7e64b8b1de98db37238f254ad88..064e70a35dc0bf1b2ba85066b6df6101efe4f3fe 100644 (file)
--- a/src/internal/goexperiment/flags.go
+++ b/src/internal/goexperiment/flags.go
@@ -114,6 +114,6 @@ type Flags struct {
        // inlining phase within the Go compiler.
        NewInliner bool
 
-       // Range enables range over int and func.
-       Range bool
+       // RangeFunc enables range over func.
+       RangeFunc bool
 }

diff --git a/src/internal/types/testdata/spec/range.go b/src/internal/types/testdata/spec/range.go
index 8547ed343a6e74e029f6f61decbaf8c5a267db93..4ae270d233d7b2694f7e6e423b15640300491a90 100644 (file)
--- a/src/internal/types/testdata/spec/range.go
+++ b/src/internal/types/testdata/spec/range.go
@@ -1,4 +1,4 @@
-// -goexperiment=range
+// -goexperiment=rangefunc
 
 // Copyright 2023 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

diff --git a/test/range2.go b/test/range2.go
index bb2200b98b757333edee867c9411edeb95524851..6ccf1e53d82e230df129b5ce23f7e95afb6206ea 100644 (file)
--- a/test/range2.go
+++ b/test/range2.go
@@ -1,4 +1,4 @@
-// errorcheck -goexperiment range
+// errorcheck -goexperiment rangefunc
 
 // Copyright 2023 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

diff --git a/test/range4.go b/test/range4.go
index 561b3b58b1e5f0b2937f0a33239c9432c1bc59a2..696b205ab74112af96ad26919011dbb57667176a 100644 (file)
--- a/test/range4.go
+++ b/test/range4.go
@@ -1,4 +1,4 @@
-// run -goexperiment range
+// run -goexperiment rangefunc
 
 // Copyright 2023 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

diff --git a/test/rangegen.go b/test/rangegen.go
index 7916ed2b9fd35662ffa730d5d127908e580634da..bdcf099862db867e25a1a22a9e1c5ca911a45c61 100644 (file)
--- a/test/rangegen.go
+++ b/test/rangegen.go
@@ -1,4 +1,4 @@
-// runoutput -goexperiment range
+// runoutput -goexperiment rangefunc
 
 // Copyright 2023 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style