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

small optimization for evaller

Browse Source
This commit is contained in:
Pekka Laiho 2020-12-07 09:13:46 +07:00
parent 55da5fb9b6
commit 086765d286
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Evaller.php
View File

@ -42,12 +42,17 @@ class Evaller
// Handle response for anything but a list // Handle response for anything but a list
if ($ast instanceof Symbol) { if ($ast instanceof Symbol) {
// Lookup symbol from env
return $env->get($ast->getName()); return $env->get($ast->getName());
} elseif ($ast instanceof Vector || $ast instanceof Hash) { } elseif ($ast instanceof Vector || $ast instanceof Hash) {
$newData = []; $newData = [];
foreach ($ast->getData() as $key => $val) { foreach ($ast->getData() as $key => $val) {
$newData[$key] = $this->eval($val, $env, $depth + 1); if ($val instanceof Symbol) {
$newData[$key] = $env->get($val->getName());
} elseif ($val instanceof Collection) {
$newData[$key] = $this->eval($val, $env, $depth + 1);
} else {
$newData[$key] = $val;
}
} }
return $ast::new($newData); return $ast::new($newData);
} elseif ($ast instanceof MList == false) { } elseif ($ast instanceof MList == false) {
@ -198,10 +203,10 @@ class Evaller
if ($result == true) { if ($result == true) {
$ast = $astData[2]; $ast = $astData[2];
continue; continue; // tco
} elseif ($astLength == 4) { } elseif ($astLength == 4) {
$ast = $astData[3]; $ast = $astData[3];
continue; continue; // tco
} else { } else {
return null; return null;
} }
@ -330,7 +335,6 @@ class Evaller
$newData = []; $newData = [];
foreach ($astData as $a) { foreach ($astData as $a) {
if ($a instanceof Symbol) { if ($a instanceof Symbol) {
// Lookup symbol from env
$newData[] = $env->get($a->getName()); $newData[] = $env->get($a->getName());
} elseif ($a instanceof Collection) { } elseif ($a instanceof Collection) {
$newData[] = $this->eval($a, $env, $depth + 1); $newData[] = $this->eval($a, $env, $depth + 1);