cco/go-scopes
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iterator simplifications

Browse source
This commit is contained in:
Helmut Merz 2023-07-17 10:43:11 +02:00
parent 9c9992065b
commit 3a5225e0d6
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/funky/funky.go
View file

@ -33,7 +33,6 @@ func (m *maybe[V]) Value() V {
// Iterator // Iterator
type Iterator[V any] interface { type Iterator[V any] interface {
Maybe[V]
Next() Maybe[V] Next() Maybe[V]
} }
@ -43,24 +42,15 @@ type sliceIt[V any] struct {
} }
func SliceIterator[V any](sl []V) Iterator[V] { func SliceIterator[V any](sl []V) Iterator[V] {
return &sliceIt[V]{slice: sl} return &sliceIt[V]{-1, sl}
} }
func (it *sliceIt[V]) Next() Maybe[V] { func (it *sliceIt[V]) Next() Maybe[V] {
if it.IsNothing() { if it.idx >= len(it.slice)-1 {
return Nothing[V]() return Nothing[V]()
} }
v := it.Value()
it.idx++ it.idx++
return Just(v) return Just(it.slice[it.idx])
}
func (it *sliceIt[V]) IsNothing() bool {
return it.idx >= len(it.slice)
}
func (it *sliceIt[V]) Value() V {
return it.slice[it.idx]
} }
func Slice[V any](it Iterator[V]) []V { func Slice[V any](it Iterator[V]) []V {