Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-10-19 11:03:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

reflect: let Value.Seq return the iteration value correct type

Browse source 
Fixes #71905

Change-Id: I50a418f8552e071c6e5011af5b9accc7d41548d0
Reviewed-on: https://go-review.googlesource.com/c/go/+/651855
Reviewed-by: Ian Lance Taylor <iant@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Michael Pratt <mpratt@google.com>
This commit is contained in:
qiulaidongfeng 2025-02-23 11:06:17 +08:00 • committed by Gopher Robot
parent 8b8bff7bb2
commit 194696f1d1
2 changed files with 79 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/reflect/iter.go
View file

@ -4,15 +4,24 @@
package reflect
import "iter"
import (
"iter"
)
func rangeNum[T int8 | int16 | int32 | int64 | int |
uint8 | uint16 | uint32 | uint64 | uint |
uintptr, N int64 | uint64](v N) iter.Seq[Value] {
uintptr, N int64 | uint64](num N, t Type) iter.Seq[Value] {
return func(yield func(v Value) bool) {
convert := t.PkgPath() != ""
// cannot use range T(v) because no core type.
for i := T(0); i < T(v); i++ {
if !yield(ValueOf(i)) {
for i := T(0); i < T(num); i++ {
tmp := ValueOf(i)
// if the iteration value type is define by
// type T built-in type.
if convert {
tmp = tmp.Convert(t)
}
if !yield(tmp) {
return
}
}
@ -35,29 +44,29 @@ func (v Value) Seq() iter.Seq[Value] {
v.Call([]Value{rf})
}
}
switch v.Kind() {
switch v.kind() {
case Int:
return rangeNum[int](v.Int())
return rangeNum[int](v.Int(), v.Type())
case Int8:
return rangeNum[int8](v.Int())
return rangeNum[int8](v.Int(), v.Type())
case Int16:
return rangeNum[int16](v.Int())
return rangeNum[int16](v.Int(), v.Type())
case Int32:
return rangeNum[int32](v.Int())
return rangeNum[int32](v.Int(), v.Type())
case Int64:
return rangeNum[int64](v.Int())
return rangeNum[int64](v.Int(), v.Type())
case Uint:
return rangeNum[uint](v.Uint())
return rangeNum[uint](v.Uint(), v.Type())
case Uint8:
return rangeNum[uint8](v.Uint())
return rangeNum[uint8](v.Uint(), v.Type())
case Uint16:
return rangeNum[uint16](v.Uint())
return rangeNum[uint16](v.Uint(), v.Type())
case Uint32:
return rangeNum[uint32](v.Uint())
return rangeNum[uint32](v.Uint(), v.Type())
case Uint64:
return rangeNum[uint64](v.Uint())
return rangeNum[uint64](v.Uint(), v.Type())
case Uintptr:
return rangeNum[uintptr](v.Uint())
return rangeNum[uintptr](v.Uint(), v.Type())
case Pointer:
if v.Elem().kind() != Array {
break

54
src/reflect/iter_test.go
View file

@ -7,10 +7,13 @@ package reflect_test
import (
"iter"
"maps"
"reflect"
. "reflect"
"testing"
)
type N int8
func TestValueSeq(t *testing.T) {
m := map[string]int{
"1": 1,
@ -185,6 +188,21 @@ func TestValueSeq(t *testing.T) {
t.Fatalf("should loop four times")
}
}},
{"type N int8", ValueOf(N(4)), func(t *testing.T, s iter.Seq[Value]) {
i := N(0)
for v := range s {
if v.Int() != int64(i) {
t.Fatalf("got %d, want %d", v.Int(), i)
}
i++
if v.Type() != reflect.TypeOf(i) {
t.Fatalf("got %s, want %s", v.Type(), reflect.TypeOf(i))
}
}
if i != 4 {
t.Fatalf("should loop four times")
}
}},
}
for _, tc := range tests {
seq := tc.val.Seq()
@ -320,6 +338,42 @@ func TestValueSeq2(t *testing.T) {
t.Fatalf("should loop four times")
}
}},
{"[4]N", ValueOf([4]N{0, 1, 2, 3}), func(t *testing.T, s iter.Seq2[Value, Value]) {
i := N(0)
for v1, v2 := range s {
if v1.Int() != int64(i) {
t.Fatalf("got %d, want %d", v1.Int(), i)
}
if v2.Int() != int64(i) {
t.Fatalf("got %d, want %d", v2.Int(), i)
}
i++
if v2.Type() != reflect.TypeOf(i) {
t.Fatalf("got %s, want %s", v2.Type(), reflect.TypeOf(i))
}
}
if i != 4 {
t.Fatalf("should loop four times")
}
}},
{"[]N", ValueOf([]N{1, 2, 3, 4}), func(t *testing.T, s iter.Seq2[Value, Value]) {
i := N(0)
for v1, v2 := range s {
if v1.Int() != int64(i) {
t.Fatalf("got %d, want %d", v1.Int(), i)
}
i++
if v2.Int() != int64(i) {
t.Fatalf("got %d, want %d", v2.Int(), i)
}
if v2.Type() != reflect.TypeOf(i) {
t.Fatalf("got %s, want %s", v2.Type(), reflect.TypeOf(i))
}
}
if i != 4 {
t.Fatalf("should loop four times")
}
}},
}
for _, tc := range tests {
seq := tc.val.Seq2()