starlark: new API for go1.23 push iterators (#527)
This change defines two helpers, Elements(seq)
and Entries(mapping), that adapt the Iterable and
IterableMapping interfaces to one- and two-variable
go1.23 range loops. The new syntax is more concise
and frees the caller from worrying about Iterator.Done.
We do not yet update any calls to use them, so that
the project can continue to be build with pre-go1.23
releases of Go.
Also, define Elements methods on {*List,Tuple,*Set}
and an Entries method on *Dict. These optimized iterators
(which can fetch both k and v in one go) will be
used by the Elements and Entries standalone functions
when the operand supports it. (User-defined types
can implement these methods too, although the
interface isn't currently documented.)
Also, a go1.23-only test of the new iteration.diff --git a/starlark/hashtable.go b/starlark/hashtable.go
index 7a42761..e1bbeaa 100644
--- a/starlark/hashtable.go
+++ b/starlark/hashtable.go
@@ -416,6 +416,16 @@
}
}
+// entries is a go1.23 iterator over the entries of the hash table.
+func (ht *hashtable) entries(yield func(k, v Value) bool) {
+ if !ht.frozen {
+ ht.itercount++
+ defer func() { ht.itercount-- }()
+ }
+ for e := ht.head; e != nil && yield(e.key, e.value); e = e.next {
+ }
+}
+
var seed = maphash.MakeSeed()
// hashString computes the hash of s.
diff --git a/starlark/iterator_test.go b/starlark/iterator_test.go
new file mode 100644
index 0000000..0ecaad4
--- /dev/null
+++ b/starlark/iterator_test.go
@@ -0,0 +1,116 @@
+// Copyright 2024 The Bazel Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build go1.23
+
+package starlark_test
+
+// This file defines tests of the starlark.Value Go API's go1.23 iterators:
+//
+// ({Tuple,*List,(Set}).Elements
+// Elements
+// (*Dict).Entries
+// Entries
+
+import (
+ "fmt"
+ "reflect"
+ "testing"
+
+ . "go.starlark.net/starlark"
+)
+
+func TestTupleElements(t *testing.T) {
+ tuple := Tuple{MakeInt(1), MakeInt(2), MakeInt(3)}
+
+ var got []string
+ for elem := range tuple.Elements {
+ got = append(got, fmt.Sprint(elem))
+ if len(got) == 2 {
+ break // skip 3
+ }
+ }
+ for elem := range Elements(tuple) {
+ got = append(got, fmt.Sprint(elem))
+ if len(got) == 4 {
+ break // skip 3
+ }
+ }
+ want := []string{"1", "2", "1", "2"}
+ if !reflect.DeepEqual(got, want) {
+ t.Errorf("got %v, want %v", got, want)
+ }
+}
+
+func TestListElements(t *testing.T) {
+ list := NewList([]Value{MakeInt(1), MakeInt(2), MakeInt(3)})
+
+ var got []string
+ for elem := range list.Elements {
+ got = append(got, fmt.Sprint(elem))
+ if len(got) == 2 {
+ break // skip 3
+ }
+ }
+ for elem := range Elements(list) {
+ got = append(got, fmt.Sprint(elem))
+ if len(got) == 4 {
+ break // skip 3
+ }
+ }
+ want := []string{"1", "2", "1", "2"}
+ if !reflect.DeepEqual(got, want) {
+ t.Errorf("got %v, want %v", got, want)
+ }
+}
+
+func TestSetElements(t *testing.T) {
+ set := NewSet(3)
+ set.Insert(MakeInt(1))
+ set.Insert(MakeInt(2))
+ set.Insert(MakeInt(3))
+
+ var got []string
+ for elem := range set.Elements {
+ got = append(got, fmt.Sprint(elem))
+ if len(got) == 2 {
+ break // skip 3
+ }
+ }
+ for elem := range Elements(set) {
+ got = append(got, fmt.Sprint(elem))
+ if len(got) == 4 {
+ break // skip 3
+ }
+ }
+ want := []string{"1", "2", "1", "2"}
+ if !reflect.DeepEqual(got, want) {
+ t.Errorf("got %v, want %v", got, want)
+ }
+}
+
+func TestDictEntries(t *testing.T) {
+ dict := NewDict(2)
+ dict.SetKey(String("one"), MakeInt(1))
+ dict.SetKey(String("two"), MakeInt(2))
+ dict.SetKey(String("three"), MakeInt(3))
+
+ var got []string
+ for k, v := range dict.Entries {
+ got = append(got, fmt.Sprintf("%v %v", k, v))
+ if len(got) == 2 {
+ break // skip 3
+ }
+ }
+ for k, v := range Entries(dict) {
+ got = append(got, fmt.Sprintf("%v %v", k, v))
+ if len(got) == 4 {
+ break // skip 3
+ }
+ }
+ want := []string{`"one" 1`, `"two" 2`, `"one" 1`, `"two" 2`}
+ if !reflect.DeepEqual(got, want) {
+ t.Errorf("got %v, want %v", got, want)
+ }
+}
diff --git a/starlark/value.go b/starlark/value.go
index 22a37c8..af16239 100644
--- a/starlark/value.go
+++ b/starlark/value.go
@@ -254,12 +254,17 @@
//
// Example usage:
//
-// iter := iterable.Iterator()
+// var seq Iterator = ...
+// iter := seq.Iterate()
// defer iter.Done()
-// var x Value
-// for iter.Next(&x) {
+// var elem Value
+// for iter.Next(elem) {
// ...
// }
+//
+// Or, using go1.23 iterators:
+//
+// for elem := range Elements(seq) { ... }
type Iterator interface {
// If the iterator is exhausted, Next returns false.
// Otherwise it sets *p to the current element of the sequence,
@@ -283,6 +288,8 @@
}
// An IterableMapping is a mapping that supports key enumeration.
+//
+// See [Entries] for example use.
type IterableMapping interface {
Mapping
Iterate() Iterator // see Iterable interface
@@ -847,6 +854,7 @@
func (d *Dict) Freeze() { d.ht.freeze() }
func (d *Dict) Truth() Bool { return d.Len() > 0 }
func (d *Dict) Hash() (uint32, error) { return 0, fmt.Errorf("unhashable type: dict") }
+func (d *Dict) Entries(yield func(k, v Value) bool) { d.ht.entries(yield) }
func (x *Dict) Union(y *Dict) *Dict {
z := new(Dict)
@@ -954,6 +962,23 @@
return &listIterator{l: l}
}
+// Elements is a go1.23 iterator over the elements of the list.
+//
+// Example:
+//
+// for elem := range list.Elements { ... }
+func (l *List) Elements(yield func(Value) bool) {
+ if !l.frozen {
+ l.itercount++
+ defer func() { l.itercount-- }()
+ }
+ for _, x := range l.elems {
+ if !yield(x) {
+ break
+ }
+ }
+}
+
func (x *List) CompareSameType(op syntax.Token, y_ Value, depth int) (bool, error) {
y := y_.(*List)
// It's tempting to check x == y as an optimization here,
@@ -1053,6 +1078,20 @@
}
func (t Tuple) Iterate() Iterator { return &tupleIterator{elems: t} }
+
+// Elements is a go1.23 iterator over the elements of the tuple.
+//
+// (A Tuple is a slice, so it is of course directly iterable. This
+// method exists to provide a fast path for the [Elements] standalone
+// function.)
+func (t Tuple) Elements(yield func(Value) bool) {
+ for _, x := range t {
+ if !yield(x) {
+ break
+ }
+ }
+}
+
func (t Tuple) Freeze() {
for _, elem := range t {
elem.Freeze()
@@ -1124,6 +1163,9 @@
func (s *Set) Attr(name string) (Value, error) { return builtinAttr(s, name, setMethods) }
func (s *Set) AttrNames() []string { return builtinAttrNames(setMethods) }
+func (s *Set) Elements(yield func(k Value) bool) {
+ s.ht.entries(func(k, _ Value) bool { return yield(k) })
+}
func (x *Set) CompareSameType(op syntax.Token, y_ Value, depth int) (bool, error) {
y := y_.(*Set)
@@ -1561,6 +1603,74 @@
return nil
}
+// Elements returns an iterator for the elements of the iterable value.
+//
+// Example of go1.23 iteration:
+//
+// for elem := range Elements(iterable) { ... }
+//
+// Push iterators are provided as a convience for Go client code. The
+// core iteration behavior of Starlark for-loops is defined by the
+// [Iterable] interface.
+//
+// TODO(adonovan): change return type to go1.23 iter.Seq[Value].
+func Elements(iterable Iterable) func(yield func(Value) bool) {
+ // Use specialized push iterator if available (*List, Tuple, *Set).
+ type hasElements interface {
+ Elements(yield func(k Value) bool)
+ }
+ if iterable, ok := iterable.(hasElements); ok {
+ return iterable.Elements
+ }
+
+ iter := iterable.Iterate()
+ return func(yield func(Value) bool) {
+ defer iter.Done()
+ var x Value
+ for iter.Next(&x) && yield(x) {
+ }
+ }
+}
+
+// Entries returns an iterator over the entries (key/value pairs) of
+// the iterable mapping.
+//
+// Example of go1.23 iteration:
+//
+// for k, v := range Entries(mapping) { ... }
+//
+// Push iterators are provided as a convience for Go client code. The
+// core iteration behavior of Starlark for-loops is defined by the
+// [Iterable] interface.
+//
+// TODO(adonovan): change return type to go1.23 iter.Seq2[Value, Value].
+func Entries(mapping IterableMapping) func(yield func(k, v Value) bool) {
+ // If available (e.g. *Dict), use specialized push iterator,
+ // as it gets k and v in one shot.
+ type hasEntries interface {
+ Entries(yield func(k, v Value) bool)
+ }
+ if mapping, ok := mapping.(hasEntries); ok {
+ return mapping.Entries
+ }
+
+ iter := mapping.Iterate()
+ return func(yield func(k, v Value) bool) {
+ defer iter.Done()
+ var k Value
+ for iter.Next(&k) {
+ v, found, err := mapping.Get(k)
+ if err != nil || !found {
+ panic(fmt.Sprintf("Iterate and Get are inconsistent (mapping=%v, key=%v)",
+ mapping.Type(), k.Type()))
+ }
+ if !yield(k, v) {
+ break
+ }
+ }
+ }
+}
+
// Bytes is the type of a Starlark binary string.
//
// A Bytes encapsulates an immutable sequence of bytes.
