@@ -16,31 +16,31 @@ discard block |
||
| 16 | 16 | { |
| 17 | 17 | public static function concat(): Closure |
| 18 | 18 | { |
| 19 | - return static fn (callable $xs): Closure => static fn (callable $ys): Closure => self::foldr()(self::cons())($ys)($xs); |
|
| 19 | + return static fn(callable $xs): Closure => static fn(callable $ys): Closure => self::foldr()(self::cons())($ys)($xs); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | public static function cons(): Closure |
| 23 | 23 | { |
| 24 | - return static fn (callable $a): Closure => static fn (callable $b): Closure => Pair::of()(Boolean::CFalse())(Pair::of()($a)($b)); |
|
| 24 | + return static fn(callable $a): Closure => static fn(callable $b): Closure => Pair::of()(Boolean::CFalse())(Pair::of()($a)($b)); |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | public static function foldl() |
| 28 | 28 | { |
| 29 | - return static fn (callable $f): Closure => static fn ($a): Closure => static fn (callable $xs) => self::foldr()( |
|
| 30 | - static fn (callable $x): Closure => static fn (callable $g): Closure => static fn ($y) => $g($f($y)($x)) |
|
| 29 | + return static fn(callable $f): Closure => static fn($a): Closure => static fn(callable $xs) => self::foldr()( |
|
| 30 | + static fn(callable $x): Closure => static fn(callable $g): Closure => static fn($y) => $g($f($y)($x)) |
|
| 31 | 31 | )(Combinators::I())($xs)($a); |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | public static function foldr() |
| 35 | 35 | { |
| 36 | 36 | return Combinators::Y()( |
| 37 | - static fn (callable $r): Closure => static fn (callable $f): Closure => static fn ($a): Closure => static fn (callable $xs) => Boolean::CIf()(self::isNil()($xs))(static fn () => $a)(static fn () => $f(self::head()($xs))($r($f)($a)(self::tail()($xs))))() |
|
| 37 | + static fn(callable $r): Closure => static fn(callable $f): Closure => static fn($a): Closure => static fn(callable $xs) => Boolean::CIf()(self::isNil()($xs))(static fn() => $a)(static fn() => $f(self::head()($xs))($r($f)($a)(self::tail()($xs))))() |
|
| 38 | 38 | ); |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | public static function head(): Closure |
| 42 | 42 | { |
| 43 | - return static fn (callable $a): Closure => Pair::first()(Pair::second()($a)); |
|
| 43 | + return static fn(callable $a): Closure => Pair::first()(Pair::second()($a)); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | public static function isNil(): Closure |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | public static function length(): Closure |
| 52 | 52 | { |
| 53 | - return self::foldl()(static fn (callable $a): Closure => static fn (callable $b): Closure => Numeral::succ()($a))(Numeral::zero()); |
|
| 53 | + return self::foldl()(static fn(callable $a): Closure => static fn(callable $b): Closure => Numeral::succ()($a))(Numeral::zero()); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | public static function nil(): Closure |
@@ -60,13 +60,13 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | public static function range(): Closure |
| 62 | 62 | { |
| 63 | - return static fn (callable $a): Closure => static fn (callable $b): Closure => Numeral::minus()(Numeral::succ()($b))($a)(static fn (callable $c): Closure => CList::cons()(Numeral::minus()($b)(CList::length()($c)))($c))(CList::nil()); |
|
| 63 | + return static fn(callable $a): Closure => static fn(callable $b): Closure => Numeral::minus()(Numeral::succ()($b))($a)(static fn(callable $c): Closure => CList::cons()(Numeral::minus()($b)(CList::length()($c)))($c))(CList::nil()); |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | public static function repeat(): Closure |
| 67 | 67 | { |
| 68 | - return static fn (callable $a): Closure => static fn (callable $b): Closure => $b( |
|
| 69 | - static fn ($c): Closure => CList::cons()($a)($c) |
|
| 68 | + return static fn(callable $a): Closure => static fn(callable $b): Closure => $b( |
|
| 69 | + static fn($c): Closure => CList::cons()($a)($c) |
|
| 70 | 70 | )(CList::nil()); |
| 71 | 71 | } |
| 72 | 72 | |
@@ -77,6 +77,6 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | public static function tail(): Closure |
| 79 | 79 | { |
| 80 | - return static fn (callable $a): Closure => Pair::second()(Pair::second()($a)); |
|
| 80 | + return static fn(callable $a): Closure => Pair::second()(Pair::second()($a)); |
|
| 81 | 81 | } |
| 82 | 82 | } |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | { |
| 17 | 17 | public static function CAnd(): Closure |
| 18 | 18 | { |
| 19 | - return static fn (callable $l): Closure => static fn (callable $c): Closure => $l($c)(self::CFalse()); |
|
| 19 | + return static fn(callable $l): Closure => static fn(callable $c): Closure => $l($c)(self::CFalse()); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | public static function CFalse(): Closure |
@@ -46,36 +46,36 @@ discard block |
||
| 46 | 46 | |
| 47 | 47 | public static function CXor(): Closure |
| 48 | 48 | { |
| 49 | - return static fn (callable $a): Closure => static fn (callable $b): Closure => ($a($b(self::CFalse())(self::CTrue())))($b(self::CTrue())(self::CFalse())); |
|
| 49 | + return static fn(callable $a): Closure => static fn(callable $b): Closure => ($a($b(self::CFalse())(self::CTrue())))($b(self::CTrue())(self::CFalse())); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | public static function eq(): Closure |
| 53 | 53 | { |
| 54 | - return static fn (callable $a): Closure => static fn (callable $b): Closure => self::CAnd()(self::lte()($a)($b))(self::lte()($b)($a)); |
|
| 54 | + return static fn(callable $a): Closure => static fn(callable $b): Closure => self::CAnd()(self::lte()($a)($b))(self::lte()($b)($a)); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | public static function gt(): Closure |
| 58 | 58 | { |
| 59 | - return static fn (callable $a): Closure => static fn (callable $b): Closure => self::CNot()(self::lte()($a)($b)); |
|
| 59 | + return static fn(callable $a): Closure => static fn(callable $b): Closure => self::CNot()(self::lte()($a)($b)); |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | public static function gte(): Closure |
| 63 | 63 | { |
| 64 | - return static fn (callable $a): Closure => static fn (callable $b): Closure => self::isZero()(Numeral::minus()($b)($a)); |
|
| 64 | + return static fn(callable $a): Closure => static fn(callable $b): Closure => self::isZero()(Numeral::minus()($b)($a)); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | public static function isZero(): Closure |
| 68 | 68 | { |
| 69 | - return static fn (callable $a): Closure => $a(Combinators::K()(self::CFalse()))(self::CTrue()); |
|
| 69 | + return static fn(callable $a): Closure => $a(Combinators::K()(self::CFalse()))(self::CTrue()); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | public static function lt(): Closure |
| 73 | 73 | { |
| 74 | - return static fn (callable $a): Closure => static fn (callable $b): Closure => self::CNot()(self::gte()($a)($b)); |
|
| 74 | + return static fn(callable $a): Closure => static fn(callable $b): Closure => self::CNot()(self::gte()($a)($b)); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | public static function lte(): Closure |
| 78 | 78 | { |
| 79 | - return static fn (callable $a): Closure => static fn (callable $b): Closure => self::isZero()(Numeral::minus()($a)($b)); |
|
| 79 | + return static fn(callable $a): Closure => static fn(callable $b): Closure => self::isZero()(Numeral::minus()($a)($b)); |
|
| 80 | 80 | } |
| 81 | 81 | } |
@@ -56,12 +56,12 @@ discard block |
||
| 56 | 56 | |
| 57 | 57 | public static function plus(): Closure |
| 58 | 58 | { |
| 59 | - return static fn (callable $a): Closure => static fn (callable $b): Closure => static fn (callable $c): Closure => Combinators::B()($a($c))($b($c)); |
|
| 59 | + return static fn(callable $a): Closure => static fn(callable $b): Closure => static fn(callable $c): Closure => Combinators::B()($a($c))($b($c)); |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | public static function pred(): Closure |
| 63 | 63 | { |
| 64 | - return static fn (callable $a): Closure => static fn (callable $b): Closure => static fn ($c) => $a(static fn ($d): Closure => static fn ($e) => $e($d($b)))(static fn () => $c)(Combinators::I()); |
|
| 64 | + return static fn(callable $a): Closure => static fn(callable $b): Closure => static fn($c) => $a(static fn($d): Closure => static fn($e) => $e($d($b)))(static fn() => $c)(Combinators::I()); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | public static function seven(): Closure |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | |
| 77 | 77 | public static function succ(): Closure |
| 78 | 78 | { |
| 79 | - return static fn (callable $n): Closure => static fn (callable $f): Closure => Combinators::B()($f)($n($f)); |
|
| 79 | + return static fn(callable $n): Closure => static fn(callable $f): Closure => Combinators::B()($f)($n($f)); |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | public static function three(): Closure |
@@ -86,14 +86,13 @@ discard block |
||
| 86 | 86 | |
| 87 | 87 | public static function toInt(callable $numeral): int |
| 88 | 88 | { |
| 89 | - return $numeral(static fn (int $n): int => $n + 1)(0); |
|
| 89 | + return $numeral(static fn(int $n): int => $n + 1)(0); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | public static function toNumeral(int $n): Closure |
| 93 | 93 | { |
| 94 | 94 | return 0 === $n - 1 ? |
| 95 | - Numeral::one() : |
|
| 96 | - Numeral::plus()(Numeral::one())(Numeral::toNumeral($n - 1)); |
|
| 95 | + Numeral::one() : Numeral::plus()(Numeral::one())(Numeral::toNumeral($n - 1)); |
|
| 97 | 96 | } |
| 98 | 97 | |
| 99 | 98 | public static function two(): Closure |
@@ -103,6 +102,6 @@ discard block |
||
| 103 | 102 | |
| 104 | 103 | public static function zero(): Closure |
| 105 | 104 | { |
| 106 | - return static fn (callable $s): Closure => Combinators::I(); |
|
| 105 | + return static fn(callable $s): Closure => Combinators::I(); |
|
| 107 | 106 | } |
| 108 | 107 | } |