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 --- js/step6_file.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'js/step6_file.js') diff --git a/js/step6_file.js b/js/step6_file.js index ee39501..aed1825 100644 --- a/js/step6_file.js +++ b/js/step6_file.js @@ -93,18 +93,12 @@ function PRINT(exp) { // repl var repl_env = new Env(); var rep = function(str) { return PRINT(EVAL(READ(str), repl_env)); }; -_ref = function (k,v) { repl_env.set(k, v); } -// Import core functions +// core.js: defined using javascript for (var n in core.ns) { repl_env.set(n, core.ns[n]); } +repl_env.set('eval', function(ast) { return EVAL(ast, repl_env); }); -_ref('read-string', reader.read_str); -_ref('eval', function(ast) { return EVAL(ast, repl_env); }); -_ref('slurp', function(f) { - return require('fs').readFileSync(f, 'utf-8'); -}); - -// Defined using the language itself +// core.mal: defined using the language itself rep("(def! not (fn* (a) (if a false true)))"); rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))"); -- cgit v1.2.3