aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Griesemer <gri@golang.org>2022-06-28 10:51:53 -0700
committerGopher Robot <gobot@golang.org>2022-06-28 18:11:31 +0000
commitd5bf9604aa597d23085435701f5f8d1584596dbd (patch)
treeb05d00d22915731c14d9a639a05c0290314d9af3
parent533082d1a08fd2c3b0c7ee43f3cf5c29f4e12d84 (diff)
downloadgo-d5bf9604aa597d23085435701f5f8d1584596dbd.tar.gz
go-d5bf9604aa597d23085435701f5f8d1584596dbd.zip
test: add more tests for const decls with ommitted RHS expressions
Add analogous tests to go/types and types2 test suites. Make sure "assert" built-in is available in type-checker tests. For #49157. For #53585. Change-Id: I092901ecb43eb4833c09bd8f5e38efbe0285babe Reviewed-on: https://go-review.googlesource.com/c/go/+/414795 Run-TryBot: Robert Griesemer <gri@google.com> Reviewed-by: Ian Lance Taylor <iant@google.com> Reviewed-by: Robert Griesemer <gri@google.com> Auto-Submit: Robert Griesemer <gri@google.com> TryBot-Result: Gopher Robot <gobot@golang.org>
-rw-r--r--src/cmd/compile/internal/types2/check_test.go2
-rw-r--r--src/cmd/compile/internal/types2/testdata/check/constdecl.go22
-rw-r--r--src/go/types/check_test.go2
-rw-r--r--src/go/types/testdata/check/constdecl.go22
-rw-r--r--test/const8.go36
5 files changed, 82 insertions, 2 deletions
diff --git a/src/cmd/compile/internal/types2/check_test.go b/src/cmd/compile/internal/types2/check_test.go
index 2e1ae0d2be..67540dcf2c 100644
--- a/src/cmd/compile/internal/types2/check_test.go
+++ b/src/cmd/compile/internal/types2/check_test.go
@@ -297,7 +297,7 @@ func TestManual(t *testing.T) {
// TODO(gri) go/types has extra TestLongConstants and TestIndexRepresentability tests
-func TestCheck(t *testing.T) { testDirFiles(t, "testdata/check", 55, false) } // TODO(gri) narrow column tolerance
+func TestCheck(t *testing.T) { DefPredeclaredTestFuncs(); testDirFiles(t, "testdata/check", 55, false) } // TODO(gri) narrow column tolerance
func TestSpec(t *testing.T) { testDirFiles(t, "testdata/spec", 0, false) }
func TestExamples(t *testing.T) { testDirFiles(t, "testdata/examples", 0, false) }
func TestFixedbugs(t *testing.T) { testDirFiles(t, "testdata/fixedbugs", 0, false) }
diff --git a/src/cmd/compile/internal/types2/testdata/check/constdecl.go b/src/cmd/compile/internal/types2/testdata/check/constdecl.go
index cb155ab35d..bb07a361fa 100644
--- a/src/cmd/compile/internal/types2/testdata/check/constdecl.go
+++ b/src/cmd/compile/internal/types2/testdata/check/constdecl.go
@@ -135,4 +135,26 @@ const (
f // ERROR invalid array length
)
+// Test that identifiers in implicit (omitted) RHS
+// expressions of constant declarations are resolved
+// in the correct context; see issues #49157, #53585.
+const X = 2
+
+func _() {
+ const (
+ A = iota // 0
+ iota = iota // 1
+ B // 1 (iota is declared locally on prev. line)
+ C // 1
+ )
+ assert(A == 0 && B == 1 && C == 1)
+
+ const (
+ X = X + X
+ Y
+ Z = iota
+ )
+ assert(X == 4 && Y == 8 && Z == 1)
+}
+
// TODO(gri) move extra tests from testdata/const0.src into here
diff --git a/src/go/types/check_test.go b/src/go/types/check_test.go
index 8765ef2e80..4684a6e296 100644
--- a/src/go/types/check_test.go
+++ b/src/go/types/check_test.go
@@ -372,7 +372,7 @@ func TestIssue47243_TypedRHS(t *testing.T) {
testFiles(t, &StdSizes{4, 4}, []string{"p.go"}, [][]byte{[]byte(src)}, false, nil)
}
-func TestCheck(t *testing.T) { testDirFiles(t, "testdata/check", false) }
+func TestCheck(t *testing.T) { DefPredeclaredTestFuncs(); testDirFiles(t, "testdata/check", false) }
func TestSpec(t *testing.T) { testDirFiles(t, "testdata/spec", false) }
func TestExamples(t *testing.T) { testDirFiles(t, "testdata/examples", false) }
func TestFixedbugs(t *testing.T) { testDirFiles(t, "testdata/fixedbugs", false) }
diff --git a/src/go/types/testdata/check/constdecl.go b/src/go/types/testdata/check/constdecl.go
index 680c85aff3..f7a9dd43c0 100644
--- a/src/go/types/testdata/check/constdecl.go
+++ b/src/go/types/testdata/check/constdecl.go
@@ -138,4 +138,26 @@ const (
f // ERROR invalid array length
)
+// Test that identifiers in implicit (omitted) RHS
+// expressions of constant declarations are resolved
+// in the correct context; see issues #49157, #53585.
+const X = 2
+
+func _() {
+ const (
+ A = iota // 0
+ iota = iota // 1
+ B // 1 (iota is declared locally on prev. line)
+ C // 1
+ )
+ assert(A == 0 && B == 1 && C == 1)
+
+ const (
+ X = X + X
+ Y
+ Z = iota
+ )
+ assert(X == 4 && Y == 8 && Z == 1)
+}
+
// TODO(gri) move extra tests from testdata/const0.src into here
diff --git a/test/const8.go b/test/const8.go
new file mode 100644
index 0000000000..9c04cc7e2c
--- /dev/null
+++ b/test/const8.go
@@ -0,0 +1,36 @@
+// run
+
+// Copyright 2022 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.
+
+// Test that identifiers in implicit (omitted) RHS
+// expressions of constant declarations are resolved
+// in the correct context; see issues #49157, #53585.
+
+package main
+
+const X = 2
+
+func main() {
+ const (
+ A = iota // 0
+ iota = iota // 1
+ B // 1 (iota is declared locally on prev. line)
+ C // 1
+ )
+ if A != 0 || B != 1 || C != 1 {
+ println("got", A, B, C, "want 0 1 1")
+ panic("FAILED")
+ }
+
+ const (
+ X = X + X
+ Y
+ Z = iota
+ )
+ if X != 4 || Y != 8 || Z != 1 {
+ println("got", X, Y, Z, "want 4 8 1")
+ panic("FAILED")
+ }
+}