From a34b02006527d28db5df5c6553be804770b81f79 Mon Sep 17 00:00:00 2001 From: Joel Martin Date: Wed, 9 Apr 2014 23:58:27 -0500 Subject: Fix metadata on functions. - Don't use metadata to store ast, env, params data. - In Clojure, store metadata on the :meta key of the real metadata. This also allows using any datatype as metadata. --- php/step9_interop.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'php/step9_interop.php') diff --git a/php/step9_interop.php b/php/step9_interop.php index a699109..3debdc4 100644 --- a/php/step9_interop.php +++ b/php/step9_interop.php @@ -122,16 +122,14 @@ function MAL_EVAL($ast, $env) { break; case "fn*": return _function('MAL_EVAL', 'native', - _hash_map('exp', $ast[2], - 'env', $env, - 'params', $ast[1])); + $ast[2], $env, $ast[1]); default: $el = eval_ast($ast, $env); $f = $el[0]; $args = array_slice($el->getArrayCopy(), 1); if ($f->type === 'native') { - $ast = $f->meta['exp']; - $env = new Env($f->meta['env'], $f->meta['params'], $args); + $ast = $f->ast; + $env = $f->gen_env($args); } else { return $f->apply($args); } -- cgit v1.2.3