refactor: Minor optimizations.

loophp · Jan 30, 2022 · 9ac298a · 9ac298a
1 parent 11bee15
commit 9ac298a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/src/Operation/DropWhile.php b/src/Operation/DropWhile.php
@@ -44,16 +44,20 @@ public function __invoke(): Closure
              * @return Generator<TKey, T>
              */
             static function (Iterator $iterator) use ($callbacks): Generator {
+                $skip = false;
+
                 foreach ($iterator as $key => $current) {
-                    if (CallbacksArrayReducer::or()($callbacks, $current, $key, $iterator)) {
+                    if (false === $skip) {
+                        if (false === CallbacksArrayReducer::or()($callbacks, $current, $key, $iterator)) {
+                            $skip = true;
+
+                            yield $key => $current;
+                        }
+
                         continue;
                     }
 
-                    break;
-                }
-
-                for (; $iterator->valid(); $iterator->next()) {
-                    yield $iterator->key() => $iterator->current();
+                    yield $key => $current;
                 }
             };
     }

diff --git a/src/Operation/Since.php b/src/Operation/Since.php
@@ -44,16 +44,20 @@ public function __invoke(): Closure
                  * @return Generator<TKey, T>
                  */
                 static function (Iterator $iterator) use ($callbacks): Generator {
+                    $skip = false;
+
                     foreach ($iterator as $key => $current) {
-                        if (!CallbacksArrayReducer::or()($callbacks, $current, $key, $iterator)) {
+                        if (false === $skip) {
+                            if (true === CallbacksArrayReducer::or()($callbacks, $current, $key, $iterator)) {
+                                $skip = true;
+
+                                yield $key => $current;
+                            }
+
                             continue;
                         }
 
-                        break;
-                    }
-
-                    for (; $iterator->valid(); $iterator->next()) {
-                        yield $iterator->key() => $iterator->current();
+                        yield $key => $current;
                     }
                 };
     }