refactor: Use For loop instead of Foreach.

So we do not call rewind before the loop.
loophp · Dec 21, 2020 · 47e0f5e · 47e0f5e
1 parent a1d636f
commit 47e0f5e
Show file tree

Hide file tree

Showing 17 changed files with 80 additions and 44 deletions.
diff --git a/src/Operation/Apply.php b/src/Operation/Apply.php
@@ -33,16 +33,19 @@ public function __invoke(): Closure
                  * @psalm-return Generator<TKey, T>
                  */
                 static function (Iterator $iterator) use ($callbacks): Generator {
-                    foreach ($iterator as $key => $value) {
+                    for (; true === $iterator->valid(); $iterator->next()) {
+                        $key = $iterator->key();
+                        $current = $iterator->current();
+
                         foreach ($callbacks as $callback) {
-                            if (true === $callback($value, $key)) {
+                            if (true === $callback($current, $key)) {
                                 continue;
                             }
 
                             break;
                         }
 
-                        yield $key => $value;
+                        yield $key => $current;
                     }
                 };
     }

diff --git a/src/Operation/Associate.php b/src/Operation/Associate.php
@@ -68,12 +68,15 @@ static function (Iterator $iterator) use ($callbackForKeys, $callbackForValues):
                                      */
                                     static fn ($initial, callable $callback, int $callbackId, Iterator $iterator) => $callback($initial, $key, $value, $iterator);
 
-                        foreach ($iterator as $key => $value) {
+                        for (; $iterator->valid(); $iterator->next()) {
+                            $key = $iterator->key();
+                            $current = $iterator->current();
+
                             /** @psalm-var Generator<int, TKey|T> $k */
-                            $k = FoldLeft::of()($callbackFactory($key)($value))($key)(new ArrayIterator($callbackForKeys));
+                            $k = FoldLeft::of()($callbackFactory($key)($current))($key)(new ArrayIterator($callbackForKeys));
 
                             /** @psalm-var Generator<int, T|TKey> $c */
-                            $c = FoldLeft::of()($callbackFactory($key)($value))($value)(new ArrayIterator($callbackForValues));
+                            $c = FoldLeft::of()($callbackFactory($key)($current))($current)(new ArrayIterator($callbackForValues));
 
                             yield $k->current() => $c->current();
                         }

diff --git a/src/Operation/Chunk.php b/src/Operation/Chunk.php
@@ -41,13 +41,15 @@ static function (Iterator $iterator) use ($sizes): Generator {
 
                     $values = [];
 
-                    foreach ($iterator as $value) {
+                    for (; $iterator->valid(); $iterator->next()) {
+                        $current = $iterator->current();
+
                         if (0 >= $sizesIterator->current()) {
                             return new EmptyIterator();
                         }
 
                         if (count($values) !== $sizesIterator->current()) {
-                            $values[] = $value;
+                            $values[] = $current;
 
                             continue;
                         }
@@ -56,7 +58,7 @@ static function (Iterator $iterator) use ($sizes): Generator {
 
                         yield $values;
 
-                        $values = [$value];
+                        $values = [$current];
                     }
 
                     return yield $values;

diff --git a/src/Operation/Collapse.php b/src/Operation/Collapse.php
@@ -27,12 +27,14 @@ public function __invoke(): Closure
              * @psalm-return Generator<TKey, T>
              */
             static function (Iterator $iterator): Generator {
-                foreach ($iterator as $value) {
-                    if (false === is_iterable($value)) {
+                for (; $iterator->valid(); $iterator->next()) {
+                    $current = $iterator->current();
+
+                    if (false === is_iterable($current)) {
                         continue;
                     }
 
-                    yield from $value;
+                    yield from $current;
                 }
             };
     }

diff --git a/src/Operation/Contains.php b/src/Operation/Contains.php
@@ -37,9 +37,11 @@ static function (Iterator $iterator) use ($values): Generator {
                     // yield count($values) === Intersect::of()(...$values)($iterator);
                     // But it would not be very optimal because it would have to traverse
                     // the whole iterator.
-                    foreach ($iterator as $value) {
+                    for (; $iterator->valid(); $iterator->next()) {
+                        $current = $iterator->current();
+
                         foreach ($values as $k => $v) {
-                            if ($v === $value) {
+                            if ($v === $current) {
                                 unset($values[$k]);
                             }
 

diff --git a/src/Operation/DropWhile.php b/src/Operation/DropWhile.php
@@ -24,7 +24,7 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param callable(T, TKey, Iterator<TKey, T>):bool $callback
+             * @psalm-param callable(T, TKey, Iterator<TKey, T>): bool ...$callbacks
              *
              * @psalm-return Closure(Iterator<TKey, T>): Generator<TKey, T>
              */

diff --git a/src/Operation/Duplicate.php b/src/Operation/Duplicate.php
@@ -31,12 +31,15 @@ public function __invoke(): Closure
             static function (Iterator $iterator): Generator {
                 $stack = [];
 
-                foreach ($iterator as $key => $value) {
-                    if (true === in_array($value, $stack, true)) {
-                        yield $key => $value;
+                for (; $iterator->valid(); $iterator->next()) {
+                    $key = $iterator->key();
+                    $current = $iterator->current();
+
+                    if (true === in_array($current, $stack, true)) {
+                        yield $key => $current;
                     }
 
-                    $stack[] = $value;
+                    $stack[] = $current;
                 }
             };
     }

diff --git a/src/Operation/Flatten.php b/src/Operation/Flatten.php
@@ -30,9 +30,12 @@ public function __invoke(): Closure
                  * @psalm-param Iterator<TKey, T> $iterator
                  */
                 static function (Iterator $iterator) use ($depth): Generator {
-                    foreach ($iterator as $key => $value) {
-                        if (false === is_iterable($value)) {
-                            yield $key => $value;
+                    for (; $iterator->valid(); $iterator->next()) {
+                        $key = $iterator->key();
+                        $current = $iterator->current();
+
+                        if (false === is_iterable($current)) {
+                            yield $key => $current;
 
                             continue;
                         }
@@ -41,10 +44,10 @@ static function (Iterator $iterator) use ($depth): Generator {
                             /** @psalm-var callable(Iterator<TKey, T>): Generator<TKey, T> $flatten */
                             $flatten = Flatten::of()($depth - 1);
 
-                            $value = $flatten(new IterableIterator($value));
+                            $current = $flatten(new IterableIterator($current));
                         }
 
-                        yield from $value;
+                        yield from $current;
                     }
                 };
     }

diff --git a/src/Operation/Flip.php b/src/Operation/Flip.php
@@ -16,7 +16,7 @@
 final class Flip extends AbstractOperation
 {
     /**
-     * @psalm-return Closure(Iterator<TKey, T>): Closure(Iterator<T, TKey>): Generator<T, TKey>
+     * @psalm-return Closure(Iterator<T, TKey>): Generator<TKey, T>
      */
     public function __invoke(): Closure
     {
@@ -40,7 +40,7 @@ public function __invoke(): Closure
              */
             static fn ($carry, $key, $value) => $key;
 
-        /** @psalm-var Closure(Iterator<TKey, T>): Generator<T, TKey> $associate */
+        /** @psalm-var Closure(Iterator<T, TKey>): Generator<TKey, T> $associate */
         $associate = Associate::of()($callbackForKeys)($callbackForValues);
 
         // Point free style.

diff --git a/src/Operation/Intersperse.php b/src/Operation/Intersperse.php
@@ -55,12 +55,15 @@ static function (Iterator $iterator) use ($element, $atEvery, $startAt): Generat
                                 );
                             }
 
-                            foreach ($iterator as $key => $value) {
+                            for (; $iterator->valid(); $iterator->next()) {
+                                $key = $iterator->key();
+                                $current = $iterator->current();
+
                                 if (0 === $startAt++ % $atEvery) {
                                     yield $element;
                                 }
 
-                                yield $key => $value;
+                                yield $key => $current;
                             }
                         };
     }

diff --git a/src/Operation/Map.php b/src/Operation/Map.php
@@ -51,8 +51,11 @@ static function (Iterator $iterator) use ($callbacks): Generator {
                              */
                             static fn ($carry, callable $callback) => $callback($carry, $key, $iterator);
 
-                    foreach ($iterator as $key => $value) {
-                        yield $key => array_reduce($callbacks, $callbackFactory($key), $value);
+                    for (; $iterator->valid(); $iterator->next()) {
+                        $key = $iterator->key();
+                        $current = $iterator->current();
+
+                        yield $key => array_reduce($callbacks, $callbackFactory($key), $current);
                     }
                 };
     }

diff --git a/src/Operation/Pad.php b/src/Operation/Pad.php
@@ -40,10 +40,10 @@ public function __invoke(): Closure
                     static function (Iterator $iterator) use ($size, $padValue): Generator {
                         $y = 0;
 
-                        foreach ($iterator as $key => $value) {
+                        for (; $iterator->valid(); $iterator->next()) {
                             ++$y;
 
-                            yield $key => $value;
+                            yield $iterator->key() => $iterator->current();
                         }
 
                         while ($y++ < $size) {

diff --git a/src/Operation/Reduction.php b/src/Operation/Reduction.php
@@ -42,8 +42,11 @@ public function __invoke(): Closure
                      * @psalm-return Generator<TKey, T|null>
                      */
                     static function (Iterator $iterator) use ($callback, $initial): Generator {
-                        foreach ($iterator as $key => $value) {
-                            yield $key => ($initial = $callback($initial, $value, $key, $iterator));
+                        for (; $iterator->valid(); $iterator->next()) {
+                            $key = $iterator->key();
+                            $current = $iterator->current();
+
+                            yield $key => ($initial = $callback($initial, $current, $key, $iterator));
                         }
                     };
     }

diff --git a/src/Operation/Split.php b/src/Operation/Split.php
@@ -63,11 +63,14 @@ static function (Iterator $iterator) use ($type, $callbacks): Generator {
                                      */
                                     static fn (bool $carry, callable $callback): bool => $callback($value, $key) || $carry;
 
-                        foreach ($iterator as $key => $value) {
-                            $callbackReturn = array_reduce($callbacks, $reducer($key)($value), false);
+                        for (; $iterator->valid(); $iterator->next()) {
+                            $key = $iterator->key();
+                            $current = $iterator->current();
+
+                            $callbackReturn = array_reduce($callbacks, $reducer($key)($current), false);
 
                             if (Splitable::AFTER === $type) {
-                                $carry[] = $value;
+                                $carry[] = $current;
                             }
 
                             if (Splitable::REMOVE === $type && true === $callbackReturn) {
@@ -85,7 +88,7 @@ static function (Iterator $iterator) use ($type, $callbacks): Generator {
                             }
 
                             if (Splitable::BEFORE === $type || Splitable::REMOVE === $type) {
-                                $carry[] = $value;
+                                $carry[] = $current;
                             }
                         }
 

diff --git a/src/Operation/TakeWhile.php b/src/Operation/TakeWhile.php
@@ -63,7 +63,10 @@ static function (Iterator $iterator) use ($callbacks): Generator {
                                  */
                                 static fn (bool $carry, callable $callable): bool => ($callable($current, $key, $iterator)) ? $carry : false;
 
-                foreach ($iterator as $key => $current) {
+                for (; true === $iterator->valid(); $iterator->next()) {
+                    $key = $iterator->key();
+                    $current = $iterator->current();
+
                     $result = array_reduce(
                         $callbacks,
                         $reducerCallback($key)($current)($iterator),

diff --git a/src/Operation/Transpose.php b/src/Operation/Transpose.php
@@ -28,7 +28,7 @@ public function __invoke(): Closure
              *
              * @psalm-return Generator<TKey, list<T>>
              */
-            static function (Iterator $iterator): Iterator {
+            static function (Iterator $iterator): Generator {
                 $mit = new MultipleIterator(MultipleIterator::MIT_NEED_ANY);
 
                 foreach ($iterator as $iterableIterator) {
@@ -54,7 +54,10 @@ static function (Iterator $iterator): Iterator {
                      */
                     static fn (array $carry, array $key, array $value): array => $value;
 
-                return Associate::of()($callbackForKeys)($callbackForValues)($mit);
+                /** @psalm-var Closure(Iterator<TKey, T>): Generator<TKey, list<T>> $associate */
+                $associate = Associate::of()($callbackForKeys)($callbackForValues);
+
+                return $associate($mit);
             };
     }
 }
diff --git a/src/Operation/Unpair.php b/src/Operation/Unpair.php
@@ -27,10 +27,10 @@ public function __invoke(): Closure
              * @psalm-return Generator<int, array{TKey, T}>
              */
             static function (Iterator $iterator): Generator {
-                foreach ($iterator as $key => $value) {
-                    yield $key;
+                for (; $iterator->valid(); $iterator->next()) {
+                    yield $iterator->key();
 
-                    yield $value;
+                    yield $iterator->current();
                 }
             };
     }