Description
We propose to add a new package golang.org/x/exp/xiter that defines adapters on iterators. Perhaps these would one day be moved to the iter package or perhaps not. There are concerns about how these would affect idiomatic Go code. It seems worth defining them in x/exp to help that discussion along, and then we can decide whether they move anywhere else when we have more experience with them.
The package is called xiter to avoid a collision with the standard library iter (see proposal #61897). An alternative would be to have xiter define wrappers and type aliases for all the functions and types in the standard iter package, but the type aliases would depend on #46477, which is not yet implemented.
This is one of a collection of proposals updating the standard library for the new 'range over function' feature (#61405). It would only be accepted if that proposal is accepted. See #61897 for a list of related proposals.
Edit, 2024-05-15: Added some missing 2s in function names, and also changed Reduce to take the function first, instead of between sum and seq.
Edit, 2024-07-17: Updated code to match the final Go 1.23 language change. Corrected various typos.
/*
Package xiter implements basic adapters for composing iterator sequences:
- [Concat] and [Concat2] concatenate sequences.
- [Equal], [Equal2], [EqualFunc], and [EqualFunc2] check whether two sequences contain equal values.
- [Filter] and [Filter2] filter a sequence according to a function f.
- [Limit] and [Limit2] truncate a sequence after n items.
- [Map] and [Map2] apply a function f to a sequence.
- [Merge], [Merge2], [MergeFunc], and [MergeFunc2] merge two ordered sequences.
- [Reduce] and [Reduce2] combine the values in a sequence.
- [Zip] and [Zip2] iterate over two sequences in parallel.
*/
package xiter
import (
"cmp"
"iter"
)
// Concat returns an iterator over the concatenation of the sequences.
func Concat[V any](seqs ...iter.Seq[V]) iter.Seq[V] {
return func(yield func(V) bool) {
for _, seq := range seqs {
for e := range seq {
if !yield(e) {
return
}
}
}
}
}
// Concat2 returns an iterator over the concatenation of the sequences.
func Concat2[K, V any](seqs ...iter.Seq2[K, V]) iter.Seq2[K, V] {
return func(yield func(K, V) bool) {
for _, seq := range seqs {
for k, v := range seq {
if !yield(k, v) {
return
}
}
}
}
}
// Equal reports whether the two sequences are equal.
func Equal[V comparable](x, y iter.Seq[V]) bool {
for z := range Zip(x, y) {
if z.Ok1 != z.Ok2 || z.V1 != z.V2 {
return false
}
}
return true
}
// Equal2 reports whether the two sequences are equal.
func Equal2[K, V comparable](x, y iter.Seq2[K, V]) bool {
for z := range Zip2(x, y) {
if z.Ok1 != z.Ok2 || z.K1 != z.K2 || z.V1 != z.V2 {
return false
}
}
return true
}
// EqualFunc reports whether the two sequences are equal according to the function f.
func EqualFunc[V1, V2 any](x iter.Seq[V1], y iter.Seq[V2], f func(V1, V2) bool) bool {
for z := range Zip(x, y) {
if z.Ok1 != z.Ok2 || !f(z.V1, z.V2) {
return false
}
}
return true
}
// EqualFunc2 reports whether the two sequences are equal according to the function f.
func EqualFunc2[K1, V1, K2, V2 any](x iter.Seq2[K1, V1], y iter.Seq2[K2, V2], f func(K1, V1, K2, V2) bool) bool {
for z := range Zip2(x, y) {
if z.Ok1 != z.Ok2 || !f(z.K1, z.V1, z.K2, z.V2) {
return false
}
}
return true
}
// Filter returns an iterator over seq that only includes
// the values v for which f(v) is true.
func Filter[V any](f func(V) bool, seq iter.Seq[V]) iter.Seq[V] {
return func(yield func(V) bool) {
for v := range seq {
if f(v) && !yield(v) {
return
}
}
}
}
// Filter2 returns an iterator over seq that only includes
// the pairs k, v for which f(k, v) is true.
func Filter2[K, V any](f func(K, V) bool, seq iter.Seq2[K, V]) iter.Seq2[K, V] {
return func(yield func(K, V) bool) {
for k, v := range seq {
if f(k, v) && !yield(k, v) {
return
}
}
}
}
// Limit returns an iterator over seq that stops after n values.
func Limit[V any](seq iter.Seq[V], n int) iter.Seq[V] {
return func(yield func(V) bool) {
if n <= 0 {
return
}
for v := range seq {
if !yield(v) {
return
}
if n--; n <= 0 {
break
}
}
}
}
// Limit2 returns an iterator over seq that stops after n key-value pairs.
func Limit2[K, V any](seq iter.Seq2[K, V], n int) iter.Seq2[K, V] {
return func(yield func(K, V) bool) {
if n <= 0 {
return
}
for k, v := range seq {
if !yield(k, v) {
return
}
if n--; n <= 0 {
break
}
}
}
}
// Map returns an iterator over f applied to seq.
func Map[In, Out any](f func(In) Out, seq iter.Seq[In]) iter.Seq[Out] {
return func(yield func(Out) bool) {
for in := range seq {
if !yield(f(in)) {
return
}
}
}
}
// Map2 returns an iterator over f applied to seq.
func Map2[KIn, VIn, KOut, VOut any](f func(KIn, VIn) (KOut, VOut), seq iter.Seq2[KIn, VIn]) iter.Seq2[KOut, VOut] {
return func(yield func(KOut, VOut) bool) {
for k, v := range seq {
if !yield(f(k, v)) {
return
}
}
}
}
// Merge merges two sequences of ordered values.
// Values appear in the output once for each time they appear in x
// and once for each time they appear in y.
// If the two input sequences are not ordered,
// the output sequence will not be ordered,
// but it will still contain every value from x and y exactly once.
//
// Merge is equivalent to calling MergeFunc with cmp.Compare[V]
// as the ordering function.
func Merge[V cmp.Ordered](x, y iter.Seq[V]) iter.Seq[V] {
return MergeFunc(x, y, cmp.Compare[V])
}
// MergeFunc merges two sequences of values ordered by the function f.
// Values appear in the output once for each time they appear in x
// and once for each time they appear in y.
// When equal values appear in both sequences,
// the output contains the values from x before the values from y.
// If the two input sequences are not ordered by f,
// the output sequence will not be ordered by f,
// but it will still contain every value from x and y exactly once.
func MergeFunc[V any](x, y iter.Seq[V], f func(V, V) int) iter.Seq[V] {
return func(yield func(V) bool) {
next, stop := iter.Pull(y)
defer stop()
v2, ok2 := next()
for v1 := range x {
for ok2 && f(v1, v2) > 0 {
if !yield(v2) {
return
}
v2, ok2 = next()
}
if !yield(v1) {
return
}
}
for ok2 {
if !yield(v2) {
return
}
v2, ok2 = next()
}
}
}
// Merge2 merges two sequences of key-value pairs ordered by their keys.
// Pairs appear in the output once for each time they appear in x
// and once for each time they appear in y.
// If the two input sequences are not ordered by their keys,
// the output sequence will not be ordered by its keys,
// but it will still contain every pair from x and y exactly once.
//
// Merge2 is equivalent to calling MergeFunc2 with cmp.Compare[K]
// as the ordering function.
func Merge2[K cmp.Ordered, V any](x, y iter.Seq2[K, V]) iter.Seq2[K, V] {
return MergeFunc2(x, y, cmp.Compare[K])
}
// MergeFunc2 merges two sequences of key-value pairs ordered by the function f.
// Pairs appear in the output once for each time they appear in x
// and once for each time they appear in y.
// When pairs with equal keys appear in both sequences,
// the output contains the pairs from x before the pairs from y.
// If the two input sequences are not ordered by f,
// the output sequence will not be ordered by f,
// but it will still contain every pair from x and y exactly once.
func MergeFunc2[K, V any](x, y iter.Seq2[K, V], f func(K, K) int) iter.Seq2[K, V] {
return func(yield func(K, V) bool) {
next, stop := iter.Pull2(y)
defer stop()
k2, v2, ok2 := next()
for k1, v1 := range x {
for ok2 && f(k1, k2) > 0 {
if !yield(k2, v2) {
return
}
k2, v2, ok2 = next()
}
if !yield(k1, v1) {
return
}
}
for ok2 {
if !yield(k2, v2) {
return
}
k2, v2, ok2 = next()
}
}
}
// Reduce combines the values in seq using f.
// For each value v in seq, it updates sum = f(sum, v)
// and then returns the final sum.
// For example, if iterating over seq yields v1, v2, v3,
// Reduce returns f(f(f(sum, v1), v2), v3).
func Reduce[Sum, V any](f func(Sum, V) Sum, sum Sum, seq iter.Seq[V]) Sum {
for v := range seq {
sum = f(sum, v)
}
return sum
}
// Reduce2 combines the values in seq using f.
// For each pair k, v in seq, it updates sum = f(sum, k, v)
// and then returns the final sum.
// For example, if iterating over seq yields (k1, v1), (k2, v2), (k3, v3)
// Reduce returns f(f(f(sum, k1, v1), k2, v2), k3, v3).
func Reduce2[Sum, K, V any](f func(Sum, K, V) Sum, sum Sum, seq iter.Seq2[K, V]) Sum {
for k, v := range seq {
sum = f(sum, k, v)
}
return sum
}
// A Zipped is a pair of zipped values, one of which may be missing,
// drawn from two different sequences.
type Zipped[V1, V2 any] struct {
V1 V1
Ok1 bool // whether V1 is present (if not, it will be zero)
V2 V2
Ok2 bool // whether V2 is present (if not, it will be zero)
}
// Zip returns an iterator that iterates x and y in parallel,
// yielding Zipped values of successive elements of x and y.
// If one sequence ends before the other, the iteration continues
// with Zipped values in which either Ok1 or Ok2 is false,
// depending on which sequence ended first.
//
// Zip is a useful building block for adapters that process
// pairs of sequences. For example, Equal can be defined as:
//
// func Equal[V comparable](x, y iter.Seq[V]) bool {
// for z := range Zip(x, y) {
// if z.Ok1 != z.Ok2 || z.V1 != z.V2 {
// return false
// }
// }
// return true
// }
func Zip[V1, V2 any](x iter.Seq[V1], y iter.Seq[V2]) iter.Seq[Zipped[V1, V2]] {
return func(yield func(z Zipped[V1, V2]) bool) {
next, stop := iter.Pull(y)
defer stop()
v2, ok2 := next()
for v1 := range x {
if !yield(Zipped[V1, V2]{v1, true, v2, ok2}) {
return
}
v2, ok2 = next()
}
var zv1 V1
for ok2 {
if !yield(Zipped[V1, V2]{zv1, false, v2, ok2}) {
return
}
v2, ok2 = next()
}
}
}
// A Zipped2 is a pair of zipped key-value pairs,
// one of which may be missing, drawn from two different sequences.
type Zipped2[K1, V1, K2, V2 any] struct {
K1 K1
V1 V1
Ok1 bool // whether K1, V1 are present (if not, they will be zero)
K2 K2
V2 V2
Ok2 bool // whether K2, V2 are present (if not, they will be zero)
}
// Zip2 returns an iterator that iterates x and y in parallel,
// yielding Zipped2 values of successive elements of x and y.
// If one sequence ends before the other, the iteration continues
// with Zipped2 values in which either Ok1 or Ok2 is false,
// depending on which sequence ended first.
//
// Zip2 is a useful building block for adapters that process
// pairs of sequences. For example, Equal2 can be defined as:
//
// func Equal2[K, V comparable](x, y iter.Seq2[K, V]) bool {
// for z := range Zip2(x, y) {
// if z.Ok1 != z.Ok2 || z.K1 != z.K2 || z.V1 != z.V2 {
// return false
// }
// }
// return true
// }
func Zip2[K1, V1, K2, V2 any](x iter.Seq2[K1, V1], y iter.Seq2[K2, V2]) iter.Seq[Zipped2[K1, V1, K2, V2]] {
return func(yield func(z Zipped2[K1, V1, K2, V2]) bool) {
next, stop := iter.Pull2(y)
defer stop()
k2, v2, ok2 := next()
for k1, v1 := range x {
if !yield(Zipped2[K1, V1, K2, V2]{k1, v1, true, k2, v2, ok2}) {
return
}
k2, v2, ok2 = next()
}
var zk1 K1
var zv1 V1
for ok2 {
if !yield(Zipped2[K1, V1, K2, V2]{zk1, zv1, false, k2, v2, ok2}) {
return
}
k2, v2, ok2 = next()
}
}
}
Metadata
Metadata
Assignees
Type
Projects
Status