rename Enumerator

hsldymq · Apr 4, 2024 · a4757fd · a4757fd
1 parent a893989
commit a4757fd
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 30 deletions.
diff --git a/enumerable.go b/enumerable.go
@@ -1,11 +1,5 @@
 package handy
 
-import "iter"
-
-type Iterable[T any] interface {
-    Iter() iter.Seq[T]
-}
-
 type Enumerable[T any] interface {
     Iterable[T]
     Count() int

diff --git a/enumerator.go b/enumerator.go
@@ -5,25 +5,25 @@ import (
     "iter"
 )
 
-func newEnumerator[TIter goiter.SeqX[T], T any](it TIter) *Enumerator[T] {
-    return &Enumerator[T]{
+func newEnumerator[TIter goiter.SeqX[T], T any](it TIter) *enumerator[T] {
+    return &enumerator[T]{
         iterator: goiter.Iterator[T](it),
     }
 }
 
-type Enumerator[T any] struct {
+type enumerator[T any] struct {
     iterator goiter.Iterator[T]
 }
 
-func (e *Enumerator[T]) Iter() iter.Seq[T] {
+func (e *enumerator[T]) Iter() iter.Seq[T] {
     return e.iterator.Seq()
 }
 
-func (e *Enumerator[T]) Count() int {
+func (e *enumerator[T]) Count() int {
     return e.iterator.Count()
 }
 
-func (e *Enumerator[T]) Any(predicate func(T) bool) bool {
+func (e *enumerator[T]) Any(predicate func(T) bool) bool {
     for each := range e.iterator {
         if predicate(each) {
             return true
@@ -32,7 +32,7 @@ func (e *Enumerator[T]) Any(predicate func(T) bool) bool {
     return false
 }
 
-func (e *Enumerator[T]) All(predicate func(T) bool) bool {
+func (e *enumerator[T]) All(predicate func(T) bool) bool {
     for each := range e.iterator {
         if !predicate(each) {
             return false
@@ -41,70 +41,70 @@ func (e *Enumerator[T]) All(predicate func(T) bool) bool {
     return true
 }
 
-func (e *Enumerator[T]) Filter(predicate func(T) bool) Enumerable[T] {
+func (e *enumerator[T]) Filter(predicate func(T) bool) Enumerable[T] {
     return filter(e, predicate)
 }
 
-func (e *Enumerator[T]) Take(n int) Enumerable[T] {
+func (e *enumerator[T]) Take(n int) Enumerable[T] {
     return newEnumerator(goiter.Take(e.Iter(), n))
 }
 
-func (e *Enumerator[T]) TakeLast(n int) Enumerable[T] {
+func (e *enumerator[T]) TakeLast(n int) Enumerable[T] {
     return newEnumerator(goiter.TakeLast(e.Iter(), n))
 }
 
-func (e *Enumerator[T]) Skip(n int) Enumerable[T] {
+func (e *enumerator[T]) Skip(n int) Enumerable[T] {
     return newEnumerator(goiter.Skip(e.Iter(), n))
 }
 
-func (e *Enumerator[T]) SkipLast(n int) Enumerable[T] {
+func (e *enumerator[T]) SkipLast(n int) Enumerable[T] {
     return newEnumerator(goiter.SkipLast(e.Iter(), n))
 }
 
-func (e *Enumerator[T]) Distinct() Enumerable[T] {
+func (e *enumerator[T]) Distinct() Enumerable[T] {
     return distinct[T](e)
 }
 
-func (e *Enumerator[T]) DistinctBy(keySelector func(T) any) Enumerable[T] {
+func (e *enumerator[T]) DistinctBy(keySelector func(T) any) Enumerable[T] {
     return distinctBy(e, keySelector)
 }
 
-func (e *Enumerator[T]) Union(target Enumerable[T]) Enumerable[T] {
+func (e *enumerator[T]) Union(target Enumerable[T]) Enumerable[T] {
     return union(e, target)
 }
 
-func (e *Enumerator[T]) UnionBy(target Enumerable[T], keySelector func(T) any) Enumerable[T] {
+func (e *enumerator[T]) UnionBy(target Enumerable[T], keySelector func(T) any) Enumerable[T] {
     return unionBy(e, target, keySelector)
 }
 
-func (e *Enumerator[T]) Intersect(target Enumerable[T]) Enumerable[T] {
+func (e *enumerator[T]) Intersect(target Enumerable[T]) Enumerable[T] {
     return intersect(e, target)
 }
 
-func (e *Enumerator[T]) IntersectBy(target Enumerable[T], keySelector func(T) any) Enumerable[T] {
+func (e *enumerator[T]) IntersectBy(target Enumerable[T], keySelector func(T) any) Enumerable[T] {
     return intersectBy(e, target, keySelector)
 }
 
-func (e *Enumerator[T]) Except(target Enumerable[T]) Enumerable[T] {
+func (e *enumerator[T]) Except(target Enumerable[T]) Enumerable[T] {
     return except(e, target)
 }
 
-func (e *Enumerator[T]) ExceptBy(target Enumerable[T], keySelector func(T) any) Enumerable[T] {
+func (e *enumerator[T]) ExceptBy(target Enumerable[T], keySelector func(T) any) Enumerable[T] {
     return exceptBy(e, target, keySelector)
 }
 
-func (e *Enumerator[T]) SequenceEqual(target Enumerable[T]) bool {
+func (e *enumerator[T]) SequenceEqual(target Enumerable[T]) bool {
     return sequenceEqual[T](e, target)
 }
 
-func (e *Enumerator[T]) SequenceEqualBy(target Enumerable[T], keySelector func(T) any) bool {
+func (e *enumerator[T]) SequenceEqualBy(target Enumerable[T], keySelector func(T) any) bool {
     return sequenceEqualBy(e, target, keySelector)
 }
 
-func (e *Enumerator[T]) Concat(iterables ...Iterable[T]) Enumerable[T] {
+func (e *enumerator[T]) Concat(iterables ...Iterable[T]) Enumerable[T] {
     return concat(e, iterables...)
 }
 
-func (e *Enumerator[T]) OrderBy(cmp func(a, b T) int) Enumerable[T] {
+func (e *enumerator[T]) OrderBy(cmp func(a, b T) int) Enumerable[T] {
     return orderBy(e, cmp)
 }