refactor: Simplify operations.

loophp · Dec 30, 2020 · e1d91ec · e1d91ec
1 parent c8d66c1
commit e1d91ec
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 22 deletions.
diff --git a/src/Operation/Drop.php b/src/Operation/Drop.php
@@ -32,12 +32,12 @@ public function __invoke(): Closure
                  *
                  * @psalm-return Generator<TKey, T>
                  */
-                static function (Iterator $iterator) use ($offsets): Generator {
-                    if (!$iterator->valid()) {
+                static function (Iterator $iterator) use ($offsets): Iterator {
+                    if (false === $iterator->valid()) {
                         return new EmptyIterator();
                     }
 
-                    return yield from new LimitIterator($iterator, array_sum($offsets));
+                    return new LimitIterator($iterator, array_sum($offsets));
                 };
     }
 }
diff --git a/src/Operation/ScanLeft.php b/src/Operation/ScanLeft.php
@@ -35,25 +35,14 @@ public function __invoke(): Closure
                  *
                  * @psalm-return Closure(Iterator<TKey, T>): Generator<int|TKey, T|null>
                  */
-                static fn ($initial = null): Closure =>
-                    /**
-                     * @psalm-param Iterator<TKey, T> $iterator
-                     *
-                     * @psalm-return Generator<int|TKey, T|null>
-                     */
-                    static function (Iterator $iterator) use ($callback, $initial): Generator {
-                        // @todo: See if we cannot find a better way to do this.
-                        if (false === $iterator->valid()) {
-                            return yield from [];
-                        }
+                static function ($initial = null) use ($callback): Closure {
+                    /** @psalm-var Closure(Iterator<TKey, T>): Generator<int|TKey, T|null> $pipe */
+                    $pipe = Pipe::of()(
+                        Reduction::of()($callback)($initial),
+                        Prepend::of()($initial)
+                    );
 
-                        /** @psalm-var Closure(Iterator<TKey, T>): Generator<int|TKey, T|null> $pipe */
-                        $pipe = Pipe::of()(
-                            Reduction::of()($callback)($initial),
-                            Prepend::of()($initial)
-                        );
-
-                        return yield from $pipe($iterator);
-                    };
+                    return $pipe;
+                };
     }
 }