mirrors/madlisp
1
0
Fork 0
mirror of https://github.com/peklaiho/madlisp.git synced 2024-10-18 04:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

add support for variable arguments using &

Browse Source
This commit is contained in:
Pekka Laiho 2020-12-19 17:45:18 +07:00
parent ed2738c91a
commit 16808c7ff9
4 changed files with 80 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Evaller.php
View File

@ -241,9 +241,7 @@ class Evaller
$closure = function (...$args) use ($bindings, $env, $astData, $depth) {
$newEnv = new Env('closure', $env);
for ($i = 0; $i < count($bindings); $i++) {
$newEnv->set($bindings[$i]->getName(), $args[$i] ?? null);
}
Util::bindArguments($newEnv, $bindings, $args);
return $this->eval($astData[2], $newEnv, $depth + 1);
};

5
src/UserFunc.php
View File

@ -38,10 +38,7 @@ class UserFunc extends Func
{
$newEnv = new Env('apply', $this->tempEnv);
$bindings = $this->bindings->getData();
for ($i = 0; $i < count($bindings); $i++) {
$newEnv->set($bindings[$i]->getName(), $args[$i] ?? null);
}
Util::bindArguments($newEnv, $this->bindings->getData(), $args);
return $newEnv;
}

16
src/Util.php
View File

@ -9,6 +9,22 @@ namespace MadLisp;
class Util
{
public static function bindArguments(Env $env, array $bindings, array $args): void
{
for ($i = 0; $i < count($bindings); $i++) {
if ($bindings[$i]->getName() == '&') {
if ($i < count($bindings) - 1) {
$env->set($bindings[$i + 1]->getName(), new Vector(array_slice($args, $i)));
return;
} else {
throw new MadLispException('no binding after &');
}
} else {
$env->set($bindings[$i]->getName(), $args[$i] ?? null);
}
}
}
public static function makeHash(array $args): Hash
{
if (count($args) % 2 == 1) {

62
test/UtilTest.php
View File

@ -7,12 +7,74 @@
use PHPUnit\Framework\TestCase;
use MadLisp\Env;
use MadLisp\Hash;
use MadLisp\MadLispException;
use MadLisp\Symbol;
use MadLisp\Util;
use MadLisp\Vector;
class UtilTest extends TestCase
{
public function testBindArguments()
{
$env = new Env('env');
Util::bindArguments($env, [
new Symbol('a'),
new Symbol('b')
], [
1,
2
]);
$this->assertSame(['a' => 1, 'b' => 2], $env->getData());
}
public function testBindArgumentsVariable()
{
$env = new Env('env');
Util::bindArguments($env, [
new Symbol('a'),
new Symbol('b'),
new Symbol('&'),
new Symbol('c')
], [
1,
2,
3,
4
]);
$data = $env->getData();
$this->assertCount(3, $data);
$this->assertSame(1, $data['a']);
$this->assertSame(2, $data['b']);
$vec = $data['c'];
$this->assertInstanceOf(Vector::class, $vec);
$this->assertSame([3, 4], $vec->getData());
}
public function testBindArgumentsVariableInvalid()
{
$this->expectException(MadLispException::class);
$this->expectExceptionMessage('no binding after &');
$env = new Env('env');
Util::bindArguments($env, [
new Symbol('a'),
new Symbol('b'),
new Symbol('&')
], [
1,
2,
3,
4
]);
}
public function testMakeHash()
{
$hash = Util::makeHash(['a', 1, 'b', 2]);