igorw
diff --git a/‎composer.json‎
Lines changed: 1 addition & 1 deletion b/‎composer.json‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎composer.lock‎
Lines changed: 1 addition & 1 deletion b/‎composer.lock‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎example.php‎ ‎examples/eval.php‎example.php renamed to examples/eval.php b/‎example.php‎ ‎examples/eval.php‎example.php renamed to examples/eval.php
diff --git a/‎examples/krivine.php‎
Lines changed: 43 additions & 0 deletions b/‎examples/krivine.php‎
Lines changed: 43 additions & 0 deletions
diff --git a/‎krivine.php‎ ‎src/krivine.php‎krivine.php renamed to src/krivine.php
Lines changed: 0 additions & 40 deletions b/‎krivine.php‎ ‎src/krivine.php‎krivine.php renamed to src/krivine.php
Lines changed: 0 additions & 40 deletions
@@ -16,6 +16,6 @@
         "jakubledl/dissect": "dev-develop"
     },
     "autoload": {
-        "files": ["src/eval.php", "src/parser.php"]
+        "files": ["src/eval.php", "src/parser.php", "src/krivine.php"]
     }
 }
@@ -0,0 +1,43 @@
+<?php
+
+namespace igorw\lambda\krivine;
+
+require 'vendor/autoload.php';
+
+// ['λ', 1]
+$identity = ['λ', 'x', 'x'];
+
+// λ λ 2
+$k = ['λ', 'x', ['λ', 'y', 'x']];
+
+// λ λ λ 3 1 (2 1)
+$s = ['λ', 'x', ['λ', 'y', ['λ', 'z', [['x', 'z'], ['y', 'z']]]]];
+
+// λ (λ 1 (λ 1)) (λ 2 1)
+$x = ['λ', 'z', [['λ', 'y', ['y', ['λ', 'x', 'x']]], ['λ', 'x', ['z', 'x']]]];
+
+// omega: loops forever
+// (λf.f f) (λf.f f)
+$omega = [['λ', 'f', ['f', 'f']], ['λ', 'f', ['f', 'f']]];
+
+// var_dump(de_bruijn($identity));
+// var_dump(de_bruijn($k));
+// var_dump(de_bruijn($s));
+// var_dump(de_bruijn($x));
+// var_dump(compile(de_bruijn($identity)));
+// var_dump(evaluate([
+//     ['constant', 5],
+//     ['stop'],
+// ]));
+// var_dump(de_bruijn(
+//     [[['λ', 'x', ['λ', 'y', 'y']], 5], 6]
+// ));
+// var_dump(compile(de_bruijn(
+//     [[['λ', 'x', ['λ', 'y', 'y']], 5], 6]
+// )));
+// var_dump(evaluate(compile(de_bruijn(
+//     [[['λ', 'x', ['λ', 'y', 'y']], 5], 6]
+// ))));
+// var_dump(evaluate(compile(de_bruijn([$identity, 42]))));
+// var_dump(evaluate(compile(de_bruijn([$k, 42]))));
+// var_dump(evaluate(compile(de_bruijn($omega))));
@@ -4,8 +4,6 @@
 
 use iter;
 
-require 'vendor/autoload.php';
-
 // (M N, S, E) → (M, (S,(N,E)), E)
 // (λM, (S,N), E) → (M, S, (E,N))
 // (i+1, S, (E,N)) → (i, S, E)
@@ -180,41 +178,3 @@ function evaluate(array $ops)
     $vm = new Machine($ops, [], []);
     return $vm->execute();
 }
-
-// ['λ', 1]
-$identity = ['λ', 'x', 'x'];
-
-// λ λ 2
-$k = ['λ', 'x', ['λ', 'y', 'x']];
-
-// λ λ λ 3 1 (2 1)
-$s = ['λ', 'x', ['λ', 'y', ['λ', 'z', [['x', 'z'], ['y', 'z']]]]];
-
-// λ (λ 1 (λ 1)) (λ 2 1)
-$x = ['λ', 'z', [['λ', 'y', ['y', ['λ', 'x', 'x']]], ['λ', 'x', ['z', 'x']]]];
-
-// omega: loops forever
-// (λf.f f) (λf.f f)
-$omega = [['λ', 'f', ['f', 'f']], ['λ', 'f', ['f', 'f']]];
-
-// var_dump(de_bruijn($identity));
-// var_dump(de_bruijn($k));
-// var_dump(de_bruijn($s));
-// var_dump(de_bruijn($x));
-// var_dump(compile(de_bruijn($identity)));
-// var_dump(evaluate([
-//     ['constant', 5],
-//     ['stop'],
-// ]));
-// var_dump(de_bruijn(
-//     [[['λ', 'x', ['λ', 'y', 'y']], 5], 6]
-// ));
-// var_dump(compile(de_bruijn(
-//     [[['λ', 'x', ['λ', 'y', 'y']], 5], 6]
-// )));
-// var_dump(evaluate(compile(de_bruijn(
-//     [[['λ', 'x', ['λ', 'y', 'y']], 5], 6]
-// ))));
-// var_dump(evaluate(compile(de_bruijn([$identity, 42]))));
-// var_dump(evaluate(compile(de_bruijn([$k, 42]))));
-// var_dump(evaluate(compile(de_bruijn($omega))));
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@`
`16`	`16`	`"jakubledl/dissect": "dev-develop"`
`17`	`17`	`},`
`18`	`18`	`"autoload": {`
`19`		`- "files": ["src/eval.php", "src/parser.php"]`
	`19`	`+ "files": ["src/eval.php", "src/parser.php", "src/krivine.php"]`
`20`	`20`	`}`
`21`	`21`	`}`