implement conj/seq

[jackhill/mal.git] / jq / step9_try.jq

diff --git a/jq/step9_try.jq b/jq/step9_try.jq
index f2f998a..4e3dc24 100644 (file)
--- a/jq/step9_try.jq
+++ b/jq/step9_try.jq
@@ -20,7 +20,7 @@ def TCOWrap(env; retenv; continue):
     {
         ast: .,
         env: env,
-        ret_env: retenv,
+        ret_env: (if retenv != null then (retenv | setpath(["atoms"]; env.atoms)) else retenv end),
         finish: (continue | not),
         cont: true # set inside
     };
@@ -88,11 +88,12 @@ def EVAL(env):
 
     def _interpret($_menv):
         reduce .value[] as $elem (
-            [];
-            . as $dot | $elem | EVAL($_menv) as $eval_env |
-                ($dot + [$eval_env.expr])
-        ) | . as $expr | first |
-                interpret($expr[1:]; $_menv; _eval_here);
+            {env: $_menv, val: []};
+            . as $dot | $elem | EVAL($dot.env) as $eval_env |
+                ($dot.env | setpath(["atoms"]; $eval_env.env.atoms)) as $_menv |
+                {env: $_menv, val: ($dot.val + [$eval_env.expr])}
+        ) | . as $expr | $expr.val | first |
+                interpret($expr.val[1:]; $expr.env; _eval_here);
 
     def macroexpand(env):
         . as $dot |
@@ -210,9 +211,8 @@ def EVAL(env):
                             ) //
                             (
                                 .value | select(.[0].value == "let*") as $value |
-                                    ($currentEnv | pureChildEnv | wrapEnv($replEnv)) as $subenv |
                                         (reduce ($value[1].value | nwise(2)) as $xvalue (
-                                            $subenv;
+                                            $_menv;
                                             . as $env | $xvalue[1] | EVAL($env) as $expenv |
                                                 env_set_($expenv.env; $xvalue[0].value; $expenv.expr))) as $env
                                                     | $value[2] | TCOWrap($env; $_retenv; true)
@@ -243,7 +243,7 @@ def EVAL(env):
                                                 else 
                                                     $exc|wrap("string")
                                                 end) as $exc |
-                                                $value[2].value[2] | EVAL($currentEnv | childEnv([$value[2].value[1].value]; [$exc]) | wrapEnv($replEnv)) as $ex |
+                                                $value[2].value[2] | EVAL($currentEnv | childEnv([$value[2].value[1].value]; [$exc]) | wrapEnv($replEnv; $_menv.atoms)) as $ex |
                                                 $ex.expr | TCOWrap($ex.env; $_retenv; false)
                                             else
                                                 error($exc)
@@ -307,13 +307,13 @@ def EVAL(env):
     | $result.ast
     | addEnv($env);
 
-def PRINT:
-    pr_str;
+def PRINT(env):
+    pr_str(env);
 
 def rep(env):
     READ | EVAL(env) as $expenv |
         if $expenv.expr != null then
-            $expenv.expr | PRINT
+            $expenv.expr | PRINT($expenv.env)
         else
             null
         end | addEnv($expenv.env);
@@ -353,7 +353,6 @@ def replEnv:
                 function: "eval"
             }
         } + core_identify),
-        dirty_atoms: [],
         fallback: null
     };
 
@@ -375,7 +374,7 @@ def eval_val(expr):
 
 def getEnv:
     replEnv
-    | wrapEnv
+    | wrapEnv({})
     | eval_ign("(def! not (fn* (a) (if a false true)))")
     | eval_ign("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\\nnil)\")))))))")
     | eval_ign("(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))")