coffee, es6, js, mal, miniMAL: fix macro result evaluation

Issue #142

coffee/step8_macros.coffee

@@ -47,8 +47,8 @@ EVAL = (ast, env) ->
   if !types._list_Q ast then return eval_ast ast, env
 
   # apply list
-  ast = macroexpand ast, env 
-  if !types._list_Q ast then return ast
+  ast = macroexpand ast, env
+  if !types._list_Q ast then return eval_ast ast, env
 
   [a0, a1, a2, a3] = ast
   switch a0.name

coffee/step9_try.coffee

@@ -47,8 +47,8 @@ EVAL = (ast, env) ->
   if !types._list_Q ast then return eval_ast ast, env
 
   # apply list
-  ast = macroexpand ast, env 
-  if !types._list_Q ast then return ast
+  ast = macroexpand ast, env
+  if !types._list_Q ast then return eval_ast ast, env
 
   [a0, a1, a2, a3] = ast
   switch a0.name

coffee/stepA_mal.coffee

@@ -47,8 +47,8 @@ EVAL = (ast, env) ->
   if !types._list_Q ast then return eval_ast ast, env
 
   # apply list
-  ast = macroexpand ast, env 
-  if !types._list_Q ast then return ast
+  ast = macroexpand ast, env
+  if !types._list_Q ast then return eval_ast ast, env
 
   [a0, a1, a2, a3] = ast
   switch a0.name

es6/step8_macros.js

@@ -64,7 +64,7 @@ const EVAL = (ast, env) => {
     if (!_list_Q(ast)) { return eval_ast(ast, env) }
 
     ast = macroexpand(ast, env)
-    if (!_list_Q(ast)) { return ast; }
+    if (!_list_Q(ast)) { return eval_ast(ast, env) }
 
     const [a0, a1, a2, a3] = ast
     const a0sym = _symbol_Q(a0) ? Symbol.keyFor(a0) : Symbol(':default')

es6/step9_try.js

@@ -64,7 +64,7 @@ const EVAL = (ast, env) => {
     if (!_list_Q(ast)) { return eval_ast(ast, env) }
 
     ast = macroexpand(ast, env)
-    if (!_list_Q(ast)) { return ast; }
+    if (!_list_Q(ast)) { return eval_ast(ast, env) }
 
     const [a0, a1, a2, a3] = ast
     const a0sym = _symbol_Q(a0) ? Symbol.keyFor(a0) : Symbol(':default')

es6/stepA_mal.js

@@ -64,7 +64,7 @@ const EVAL = (ast, env) => {
     if (!_list_Q(ast)) { return eval_ast(ast, env) }
 
     ast = macroexpand(ast, env)
-    if (!_list_Q(ast)) { return ast; }
+    if (!_list_Q(ast)) { return eval_ast(ast, env) }
 
     const [a0, a1, a2, a3] = ast
     const a0sym = _symbol_Q(a0) ? Symbol.keyFor(a0) : Symbol(':default')

js/step8_macros.js

@@ -78,7 +78,9 @@ function _EVAL(ast, env) {
 
     // apply list
     ast = macroexpand(ast, env);
-    if (!types._list_Q(ast)) { return ast; }
+    if (!types._list_Q(ast)) {
+        return eval_ast(ast, env);
+    }
 
     var a0 = ast[0], a1 = ast[1], a2 = ast[2], a3 = ast[3];
     switch (a0.value) {

js/step9_try.js

@@ -78,7 +78,9 @@ function _EVAL(ast, env) {
 
     // apply list
     ast = macroexpand(ast, env);
-    if (!types._list_Q(ast)) { return ast; }
+    if (!types._list_Q(ast)) {
+        return eval_ast(ast, env);
+    }
 
     var a0 = ast[0], a1 = ast[1], a2 = ast[2], a3 = ast[3];
     switch (a0.value) {

js/stepA_mal.js

@@ -79,7 +79,9 @@ function _EVAL(ast, env) {
 
     // apply list
     ast = macroexpand(ast, env);
-    if (!types._list_Q(ast)) { return ast; }
+    if (!types._list_Q(ast)) {
+        return eval_ast(ast, env);
+    }
 
     var a0 = ast[0], a1 = ast[1], a2 = ast[2], a3 = ast[3];
     switch (a0.value) {

mal/step8_macros.mal

@@ -74,7 +74,7 @@
     ;; apply list
     (let* [ast (MACROEXPAND ast env)]
       (if (not (list? ast))
-        ast
+        (eval-ast ast env)
 
         (let* [a0 (first ast)]
           (cond

mal/step9_try.mal

@@ -74,7 +74,7 @@
     ;; apply list
     (let* [ast (MACROEXPAND ast env)]
       (if (not (list? ast))
-        ast
+        (eval-ast ast env)
 
         (let* [a0 (first ast)]
           (cond

mal/stepA_mal.mal

@@ -74,7 +74,7 @@
     ;; apply list
     (let* [ast (MACROEXPAND ast env)]
       (if (not (list? ast))
-        ast
+        (eval-ast ast env)
 
         (let* [a0 (first ast)]
           (cond

miniMAL/step8_macros.json

@@ -73,7 +73,7 @@
     ["eval-ast", "ast", "env"],
     ["let", ["ast", ["macroexpand", "ast", "env"]],
       ["if", ["not", ["list?", "ast"]],
-        "ast",
+        ["eval-ast", "ast", "env"],
         ["let", ["a0", ["get", ["first", "ast"], ["`", "val"]]],
           ["if", ["=", ["`", "def!"], "a0"],
             ["env-set", "env", ["nth", "ast", 1],

miniMAL/step9_try.json

@@ -73,7 +73,7 @@
     ["eval-ast", "ast", "env"],
     ["let", ["ast", ["macroexpand", "ast", "env"]],
       ["if", ["not", ["list?", "ast"]],
-        "ast",
+        ["eval-ast", "ast", "env"],
         ["let", ["a0", ["get", ["first", "ast"], ["`", "val"]]],
           ["if", ["=", ["`", "def!"], "a0"],
             ["env-set", "env", ["nth", "ast", 1],

miniMAL/stepA_mal.json

@@ -73,7 +73,7 @@
     ["eval-ast", "ast", "env"],
     ["let", ["ast", ["macroexpand", "ast", "env"]],
       ["if", ["not", ["list?", "ast"]],
-        "ast",
+        ["eval-ast", "ast", "env"],
         ["let", ["a0", ["get", ["first", "ast"], ["`", "val"]]],
           ["if", ["=", ["`", "def!"], "a0"],
             ["env-set", "env", ["nth", "ast", 1],