Make lists event lazier

Author: widmogrod

src/Functional/functions.php

@@ -295,15 +295,17 @@ function foldr(callable $callable, $accumulator = null, Foldable $foldable = nul
 function filter(callable $predicate, Listt $xs = null)
 {
     return curryN(2, function (callable $predicate, Listt $xs): Listt {
-        try {
-            return $predicate(head($xs))
-                ? new ListtCons(function () use ($predicate, $xs) : array {
-                    return [head($xs), filter($predicate, tail($xs))];
-                })
-                : filter($predicate, tail($xs));
-        } catch (EmptyListError $e) {
-            return fromNil();
-        }
+        return new ListtCons(function () use ($predicate, $xs) {
+            try {
+                return $predicate(head($xs))
+                    ? new ListtCons(function () use ($predicate, $xs) {
+                        return [head($xs), filter($predicate, tail($xs))];
+                    })
+                    : filter($predicate, tail($xs));
+            } catch (EmptyListError $e) {
+                return fromNil();
+            }
+        });
     })(...func_get_args());
 }
 

src/Functional/miscellaneous.php

@@ -4,6 +4,21 @@
 
 namespace Widmogrod\Functional;
 
+/**
+ * @var callable
+ */
+const noop = 'Widmogrod\Functional\noop';
+
+/**
+ * noop :: _ -> _
+ *
+ * @return null
+ */
+function noop()
+{
+    return null;
+}
+
 /**
  * @var callable
  */

src/Primitive/ListtCons.php

@@ -7,6 +7,8 @@
 use Widmogrod\Common;
 use Widmogrod\FantasyLand;
 use Widmogrod\Functional as f;
+use function Widmogrod\Functional\constt;
+use const Widmogrod\Functional\noop;
 
 class ListtCons implements Listt, \IteratorAggregate
 {
@@ -39,7 +41,16 @@ public function getIterator()
     {
         $tail = $this;
         do {
-            [$head, $tail] = $tail->headTail();
+            $result = $tail->lazyHeadTail(function ($x, Listt $xs): array {
+                return [$x, $xs];
+            }, noop);
+
+            if (!is_array($result)) {
+                return;
+            }
+
+            [$head, $tail] = $result;
+
             yield $head;
         } while ($tail instanceof self);
     }
@@ -50,9 +61,9 @@ public function getIterator()
     public function map(callable $transformation): FantasyLand\Functor
     {
         return new self(function () use ($transformation) {
-            [$head, $tail] = $this->headTail();
-
-            return [$transformation($head), $tail->map($transformation)];
+            return $this->lazyHeadTail(function ($x, Listt $xs) use ($transformation) {
+                return [$transformation($x), $xs->map($transformation)];
+            }, constt(self::mempty()));
         });
     }
 
@@ -148,9 +159,9 @@ public function concat(FantasyLand\Semigroup $value): FantasyLand\Semigroup
 
         if ($value instanceof self) {
             return new self(function () use ($value) {
-                [$x, $xs] = $this->headTail();
-
-                return [$x, $xs->concat($value)];
+                return $this->lazyHeadTail(function ($x, Listt $xs) use ($value) {
+                    return [$x, $xs->concat($value)];
+                }, constt(self::mempty()));
             });
         }
 
@@ -162,7 +173,7 @@ public function concat(FantasyLand\Semigroup $value): FantasyLand\Semigroup
      */
     public function equals($other): bool
     {
-        return $other instanceof self
+        return $other instanceof Listt
             ? $this->extract() === $other->extract()
             : false;
     }
@@ -172,23 +183,37 @@ public function equals($other): bool
      */
     public function head()
     {
-        [$head] = $this->headTail();
-
-        return $head;
+        return $this->lazyHeadTail(function ($head) {
+            return $head;
+        }, function () {
+            throw new EmptyListError(__FUNCTION__);
+        });
     }
 
     /**
      * @inheritdoc
      */
     public function tail(): Listt
     {
-        [$head, $tail] = $this->headTail();
-
-        return $tail;
+        return $this->lazyHeadTail(function ($head, $tail) {
+            return $tail;
+        }, function () {
+            throw new EmptyListError(__FUNCTION__);
+        });
     }
 
-    public function headTail(): array
+    private function lazyHeadTail(callable $headTail, callable $nil)
     {
-        return call_user_func($this->next);
+        $result = $this;
+
+        do {
+            $result = call_user_func($result->next);
+        } while ($result instanceof self);
+
+        if ($result instanceof ListtNil) {
+            return $nil();
+        }
+
+        return $headTail(...$result);
     }
 }

test/Functional/FilterTest.php

@@ -4,10 +4,12 @@
 
 namespace test\Functional;
 
+use Widmogrod\Primitive\Listt;
 use function Widmogrod\Functional\filter;
 use function Widmogrod\Functional\fromIterable;
 use function Widmogrod\Functional\fromNil;
-use Widmogrod\Primitive\Listt;
+use function Widmogrod\Functional\repeat;
+use function Widmogrod\Functional\take;
 
 class FilterTest extends \PHPUnit\Framework\TestCase
 {
@@ -47,6 +49,10 @@ public function provideData()
                 '$list' => fromIterable(new \ArrayIterator([1, 2, 3, 4, 5])),
                 '$expected' => fromIterable([1, 3, 5]),
             ],
+            'filter everything' => [
+                '$list' => take(300, repeat(2)),
+                '$expected' => fromNil(),
+            ],
         ];
     }
 }