mirrors/madlisp
1
0
Fork 0
mirror of https://github.com/peklaiho/madlisp.git synced 2024-11-26 15:14:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow multiple expressions in let body

Browse Source
This commit is contained in:
Pekka Laiho 2020-12-11 21:29:35 +07:00
parent 36cf1ad719
commit 83c1e54463
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Evaller.php
View File

@ -264,10 +264,10 @@ class Evaller
return null; return null;
} }
} elseif ($symbolName == 'let') { } elseif ($symbolName == 'let') {
if ($astLength != 3) { if ($astLength < 3) {
throw new MadLispException("let requires exactly 2 arguments"); throw new MadLispException("let requires at least 2 arguments");
} elseif (!($astData[1] instanceof MList)) { } elseif (!($astData[1] instanceof Seq)) {
throw new MadLispException("first argument to let is not list"); throw new MadLispException("first argument to let is not seq");
} }
$bindings = $astData[1]->getData(); $bindings = $astData[1]->getData();
@ -289,7 +289,13 @@ class Evaller
$newEnv->set($key->getName(), $val); $newEnv->set($key->getName(), $val);
} }
$ast = $astData[2]; // Eval interval expressions
for ($i = 2; $i < $astLength - 1; $i++) {
$this->eval($astData[$i], $newEnv, $depth + 1);
}
// Eval last expression
$ast = $astData[$astLength - 1];
$env = $newEnv; $env = $newEnv;
continue; // tco continue; // tco
} elseif (!$this->safemode && $symbolName == 'load') { } elseif (!$this->safemode && $symbolName == 'load') {
@ -421,8 +427,8 @@ class Evaller
} elseif ($symbolName == 'try') { } elseif ($symbolName == 'try') {
if ($astLength != 3) { if ($astLength != 3) {
throw new MadLispException("try requires exactly 2 arguments"); throw new MadLispException("try requires exactly 2 arguments");
} elseif (!($astData[2] instanceof MList)) { } elseif (!($astData[2] instanceof Seq)) {
throw new MadLispException("second argument to try is not list"); throw new MadLispException("second argument to try is not seq");
} }
$catch = $astData[2]->getData(); $catch = $astData[2]->getData();