1 files changed, 51 insertions, 45 deletions

diff --git a/js/step6_file.js b/js/step6_file.js
index 6a014eb..df216da 100644
--- a/js/step6_file.js
+++ b/js/step6_file.js
@@ -1,5 +1,8 @@
 var types = require('./types');
 var reader = require('./reader');
+var printer = require('./printer');
+var Env = require('./env').Env;
+var core = require('./core');
 if (typeof module !== 'undefined') {
     var readline = require('./node_readline');
 }
@@ -11,15 +14,15 @@ function READ(str) {
 
 // eval
 function eval_ast(ast, env) {
-    if (types.symbol_Q(ast)) {
+    if (types._symbol_Q(ast)) {
         return env.get(ast);
-    } else if (types.list_Q(ast)) {
+    } else if (types._list_Q(ast)) {
         return ast.map(function(a) { return EVAL(a, env); });
-    } else if (types.vector_Q(ast)) {
+    } else if (types._vector_Q(ast)) {
         var v = ast.map(function(a) { return EVAL(a, env); });
         v.__isvector__ = true;
         return v;
-    } else if (types.hash_map_Q(ast)) {
+    } else if (types._hash_map_Q(ast)) {
         var new_hm = {};
         for (k in ast) {
             new_hm[EVAL(k, env)] = EVAL(ast[k], env);
@@ -32,45 +35,48 @@ function eval_ast(ast, env) {
 
 function _EVAL(ast, env) {
     while (true) {
-        if (!types.list_Q(ast)) {
-            return eval_ast(ast, env);
+
+    //console.log("EVAL:", types._pr_str(ast, true));
+    if (!types._list_Q(ast)) {
+        return eval_ast(ast, env);
+    }
+
+    // apply list
+    var a0 = ast[0], a1 = ast[1], a2 = ast[2], a3 = ast[3];
+    switch (a0.value) {
+    case "def!":
+        var res = EVAL(a2, env);
+        return env.set(a1, res);
+    case "let*":
+        var let_env = new Env(env);
+        for (var i=0; i < a1.length; i+=2) {
+            let_env.set(a1[i].value, EVAL(a1[i+1], let_env));
         }
-    
-        // apply list
-        var a0 = ast[0], a1 = ast[1], a2 = ast[2], a3 = ast[3];
-        switch (a0.value) {
-        case "def!":
-            var res = EVAL(a2, env);
-            return env.set(a1, res);
-        case "let*":
-            var let_env = new types.Env(env);
-            for (var i=0; i < a1.length; i+=2) {
-                let_env.set(a1[i].value, EVAL(a1[i+1], let_env));
-            }
-            return EVAL(a2, let_env);
-        case "do":
-            eval_ast(ast.slice(1, -1), env);
-            ast = ast[ast.length-1];
-            break;
-        case "if":
-            var cond = EVAL(a1, env);
-            if (cond === null || cond === false) {
-                ast = (typeof a3 !== "undefined") ? a3 : null;
-            } else {
-                ast = a2;
-            }
-            break;
-        case "fn*":
-            return types.new_function(EVAL, a2, env, a1);
-        default:
-            var el = eval_ast(ast, env), f = el[0], meta = f.__meta__;
-            if (meta && meta.exp) {
-                ast = meta.exp;
-                env = new types.Env(meta.env, meta.params, el.slice(1));
-            } else {
-                return f.apply(f, el.slice(1));
-            }
+        return EVAL(a2, let_env);
+    case "do":
+        eval_ast(ast.slice(1, -1), env);
+        ast = ast[ast.length-1];
+        break;
+    case "if":
+        var cond = EVAL(a1, env);
+        if (cond === null || cond === false) {
+            ast = (typeof a3 !== "undefined") ? a3 : null;
+        } else {
+            ast = a2;
         }
+        break;
+    case "fn*":
+        return types._function(EVAL, Env, a2, env, a1);
+    default:
+        var el = eval_ast(ast, env), f = el[0], meta = f.__meta__;
+        if (meta && meta.exp) {
+            ast = meta.exp;
+            env = new Env(meta.env, meta.params, el.slice(1));
+        } else {
+            return f.apply(f, el.slice(1));
+        }
+    }
+
     }
 }
 
@@ -81,16 +87,16 @@ function EVAL(ast, env) {
 
 // print
 function PRINT(exp) {
-    return types._pr_str(exp, true);
+    return printer._pr_str(exp, true);
 }
 
 // repl
-var repl_env = new types.Env();
+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 types functions
-for (var n in types.ns) { repl_env.set(n, types.ns[n]); }
+// Import core functions
+for (var n in core.ns) { repl_env.set(n, core.ns[n]); }
 
 _ref('read-string', reader.read_str);
 _ref('eval', function(ast) { return EVAL(ast, repl_env); });