From 8cb5cda46cf3aef847ae3926dc53a5e5f87fe261 Mon Sep 17 00:00:00 2001 From: Joel Martin Date: Wed, 16 Apr 2014 23:57:50 -0500 Subject: All: move some fns to core. Major cleanup. - Don't import/require core until step4. - Define cond/or macros from step8 --- php/step4_if_fn_do.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'php/step4_if_fn_do.php') diff --git a/php/step4_if_fn_do.php b/php/step4_if_fn_do.php index 25ca7c5..83734b1 100644 --- a/php/step4_if_fn_do.php +++ b/php/step4_if_fn_do.php @@ -90,11 +90,13 @@ function rep($str) { global $repl_env; return MAL_PRINT(MAL_EVAL(READ($str), $repl_env)); } -function _ref($k, $v) { global $repl_env; $repl_env->set($k, $v); } -// Import core functions -foreach ($core_ns as $k=>$v) { _ref($k, $v); } -// Defined using the language itself +// core.php: defined using PHP +foreach ($core_ns as $k=>$v) { + $repl_env->set($k, _function($v)); +} + +// core.mal: defined using the language itself rep("(def! not (fn* (a) (if a false true)))"); do { -- cgit v1.2.3