lift dependency on nikic/iter

igorw · igorw · commit dd18ae4e6690 · 2013-12-22T21:08:21.000+01:00
diff --git a/composer.json b/composer.json
@@ -9,9 +9,6 @@
             "email": "igor@wiedler.ch"
         }
     ],
-    "require": {
-        "nikic/iter": "dev-master"
-    },
     "require-dev": {
         "jakubledl/dissect": "dev-develop"
     },
diff --git a/composer.lock b/composer.lock
diff --git a/examples/krivine.php b/examples/krivine.php
@@ -27,7 +27,6 @@
 // var_dump(compile(de_bruijn($identity)));
 // var_dump(evaluate([
 //     ['constant', 5],
-//     ['stop'],
 // ]));
 // var_dump(de_bruijn(
 //     [[['λ', 'x', ['λ', 'y', 'y']], 5], 6]
diff --git a/src/krivine.php b/src/krivine.php
@@ -2,8 +2,6 @@
 
 namespace igorw\lambda\krivine;
 
-use iter;
-
 // (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)
@@ -32,7 +30,7 @@ function inc($value)
 
 function inc_indices($indices)
 {
-    return iter\toArrayWithKeys(iter\map('igorw\lambda\krivine\inc', $indices));
+    return array_map('igorw\lambda\krivine\inc', $indices);
 }
 
 function assoc(array $map, $key, $value)

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,6 @@`
`2`	`2`
`3`	`3`	`namespace igorw\lambda\krivine;`
`4`	`4`
`5`		`-use iter;`
`6`		`-`
`7`	`5`	`// (M N, S, E) → (M, (S,(N,E)), E)`
`8`	`6`	`// (λM, (S,N), E) → (M, S, (E,N))`
`9`	`7`	`// (i+1, S, (E,N)) → (i, S, E)`
`@@ -32,7 +30,7 @@ function inc($value)`
`32`	`30`
`33`	`31`	`function inc_indices($indices)`
`34`	`32`	`{`
`35`		`- return iter\toArrayWithKeys(iter\map('igorw\lambda\krivine\inc', $indices));`
	`33`	`+ return array_map('igorw\lambda\krivine\inc', $indices);`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`function assoc(array $map, $key, $value)`