All: TCO let* and quasiquote.

mboxed · Apr 24, 2014 · 6301e0b · 6301e0b
1 parent 89bd4de
commit 6301e0b
Show file tree

Hide file tree

Showing 70 changed files with 296 additions and 148 deletions.
diff --git a/Makefile b/Makefile
@@ -64,7 +64,7 @@ ruby_RUNSTEP =    ruby ../$(2) $(3)
 
 # Extra options to pass to runtest.py
 cs_TEST_OPTS =  --redirect
-mal_TEST_OPTS = --start-timeout 30 --test-timeout 120
+mal_TEST_OPTS = --start-timeout 60 --test-timeout 120
 
 
 # Derived lists

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 ## Description
 
 Mal is an interpreter for a subset of the Clojure programming
-language. Mal is implemented from scratch in 12 different languages:
+language. Mal is implemented from scratch in 13 different languages:
 
 * Bash shell
 * C
@@ -13,6 +13,7 @@ language. Mal is implemented from scratch in 12 different languages:
 * Javascript
 * GNU Make
 * mal itself
+* Perl
 * PHP
 * Postscript
 * Python

diff --git a/bash/step5_tco.sh b/bash/step5_tco.sh
@@ -71,8 +71,10 @@ EVAL () {
                   ENV_SET "${let_env}" "${ANON["${let_pairs[${idx}]}"]}" "${r}"
                   idx=$(( idx + 2))
               done
-              EVAL "${a2}" "${let_env}"
-              return ;;
+              ast="${a2}"
+              env="${let_env}"
+              # Continue loop
+              ;;
         do)   _count "${ast}"
               _slice "${ast}" 1 $(( ${r} - 2 ))
               EVAL_AST "${r}" "${env}"

diff --git a/bash/step6_file.sh b/bash/step6_file.sh
@@ -71,8 +71,10 @@ EVAL () {
                   ENV_SET "${let_env}" "${ANON["${let_pairs[${idx}]}"]}" "${r}"
                   idx=$(( idx + 2))
               done
-              EVAL "${a2}" "${let_env}"
-              return ;;
+              ast="${a2}"
+              env="${let_env}"
+              # Continue loop
+              ;;
         do)   _count "${ast}"
               _slice "${ast}" 1 $(( ${r} - 2 ))
               EVAL_AST "${r}" "${env}"

diff --git a/bash/step7_quote.sh b/bash/step7_quote.sh
@@ -109,15 +109,18 @@ EVAL () {
                   ENV_SET "${let_env}" "${ANON["${let_pairs[${idx}]}"]}" "${r}"
                   idx=$(( idx + 2))
               done
-              EVAL "${a2}" "${let_env}"
-              return ;;
+              ast="${a2}"
+              env="${let_env}"
+              # Continue loop
+              ;;
         quote)
               r="${a1}"
               return ;;
         quasiquote)
               QUASIQUOTE "${a1}"
-              EVAL "${r}" "${env}"
-              return ;;
+              ast="${r}"
+              # Continue loop
+              ;;
         do)   _count "${ast}"
               _slice "${ast}" 1 $(( ${r} - 2 ))
               EVAL_AST "${r}" "${env}"

diff --git a/bash/step8_macros.sh b/bash/step8_macros.sh
@@ -136,15 +136,18 @@ EVAL () {
                   ENV_SET "${let_env}" "${ANON["${let_pairs[${idx}]}"]}" "${r}"
                   idx=$(( idx + 2))
               done
-              EVAL "${a2}" "${let_env}"
-              return ;;
+              ast="${a2}"
+              env="${let_env}"
+              # Continue loop
+              ;;
         quote)
               r="${a1}"
               return ;;
         quasiquote)
               QUASIQUOTE "${a1}"
-              EVAL "${r}" "${env}"
-              return ;;
+              ast="${r}"
+              # Continue loop
+              ;;
         defmacro!)
               local k="${ANON["${a1}"]}"
               EVAL "${a2}" "${env}"

diff --git a/bash/step9_interop.sh b/bash/step9_interop.sh
@@ -136,15 +136,18 @@ EVAL () {
                   ENV_SET "${let_env}" "${ANON["${let_pairs[${idx}]}"]}" "${r}"
                   idx=$(( idx + 2))
               done
-              EVAL "${a2}" "${let_env}"
-              return ;;
+              ast="${a2}"
+              env="${let_env}"
+              # Continue loop
+              ;;
         quote)
               r="${a1}"
               return ;;
         quasiquote)
               QUASIQUOTE "${a1}"
-              EVAL "${r}" "${env}"
-              return ;;
+              ast="${r}"
+              # Continue loop
+              ;;
         defmacro!)
               local k="${ANON["${a1}"]}"
               EVAL "${a2}" "${env}"

diff --git a/bash/stepA_more.sh b/bash/stepA_more.sh
@@ -136,15 +136,18 @@ EVAL () {
                   ENV_SET "${let_env}" "${ANON["${let_pairs[${idx}]}"]}" "${r}"
                   idx=$(( idx + 2))
               done
-              EVAL "${a2}" "${let_env}"
-              return ;;
+              ast="${a2}"
+              env="${let_env}"
+              # Continue loop
+              ;;
         quote)
               r="${a1}"
               return ;;
         quasiquote)
               QUASIQUOTE "${a1}"
-              EVAL "${r}" "${env}"
-              return ;;
+              ast="${r}"
+              # Continue loop
+              ;;
         defmacro!)
               local k="${ANON["${a1}"]}"
               EVAL "${a2}" "${env}"

diff --git a/c/step5_tco.c b/c/step5_tco.c
@@ -101,7 +101,9 @@ MalVal *EVAL(MalVal *ast, Env *env) {
             assert_type(key, MAL_SYMBOL, "let* bind to non-symbol");
             env_set(let_env, key->val.string, EVAL(val, let_env));
         }
-        return EVAL(a2, let_env);
+        ast = a2;
+        env = let_env;
+        // Continue loop
     } else if ((a0->type & MAL_SYMBOL) &&
                strcmp("do", a0->val.string) == 0) {
         //g_print("eval apply do\n");

diff --git a/c/step6_file.c b/c/step6_file.c
@@ -101,7 +101,9 @@ MalVal *EVAL(MalVal *ast, Env *env) {
             assert_type(key, MAL_SYMBOL, "let* bind to non-symbol");
             env_set(let_env, key->val.string, EVAL(val, let_env));
         }
-        return EVAL(a2, let_env);
+        ast = a2;
+        env = let_env;
+        // Continue loop
     } else if ((a0->type & MAL_SYMBOL) &&
                strcmp("do", a0->val.string) == 0) {
         //g_print("eval apply do\n");

diff --git a/c/step7_quote.c b/c/step7_quote.c
@@ -128,7 +128,9 @@ MalVal *EVAL(MalVal *ast, Env *env) {
             assert_type(key, MAL_SYMBOL, "let* bind to non-symbol");
             env_set(let_env, key->val.string, EVAL(val, let_env));
         }
-        return EVAL(a2, let_env);
+        ast = a2;
+        env = let_env;
+        // Continue loop
     } else if ((a0->type & MAL_SYMBOL) &&
                strcmp("quote", a0->val.string) == 0) {
         //g_print("eval apply quote\n");
@@ -137,7 +139,8 @@ MalVal *EVAL(MalVal *ast, Env *env) {
                strcmp("quasiquote", a0->val.string) == 0) {
         //g_print("eval apply quasiquote\n");
         MalVal *a1 = _nth(ast, 1);
-        return EVAL(quasiquote(a1), env);
+        ast = quasiquote(a1);
+        // Continue loop
     } else if ((a0->type & MAL_SYMBOL) &&
                strcmp("do", a0->val.string) == 0) {
         //g_print("eval apply do\n");

diff --git a/c/step8_macros.c b/c/step8_macros.c
@@ -152,7 +152,9 @@ MalVal *EVAL(MalVal *ast, Env *env) {
             assert_type(key, MAL_SYMBOL, "let* bind to non-symbol");
             env_set(let_env, key->val.string, EVAL(val, let_env));
         }
-        return EVAL(a2, let_env);
+        ast = a2;
+        env = let_env;
+        // Continue loop
     } else if ((a0->type & MAL_SYMBOL) &&
                strcmp("quote", a0->val.string) == 0) {
         //g_print("eval apply quote\n");
@@ -161,7 +163,8 @@ MalVal *EVAL(MalVal *ast, Env *env) {
                strcmp("quasiquote", a0->val.string) == 0) {
         //g_print("eval apply quasiquote\n");
         MalVal *a1 = _nth(ast, 1);
-        return EVAL(quasiquote(a1), env);
+        ast = quasiquote(a1);
+        // Continue loop
     } else if ((a0->type & MAL_SYMBOL) &&
                strcmp("defmacro!", a0->val.string) == 0) {
         //g_print("eval apply defmacro!\n");

diff --git a/c/step9_interop.c b/c/step9_interop.c
@@ -153,7 +153,9 @@ MalVal *EVAL(MalVal *ast, Env *env) {
             assert_type(key, MAL_SYMBOL, "let* bind to non-symbol");
             env_set(let_env, key->val.string, EVAL(val, let_env));
         }
-        return EVAL(a2, let_env);
+        ast = a2;
+        env = let_env;
+        // Continue loop
     } else if ((a0->type & MAL_SYMBOL) &&
                strcmp("quote", a0->val.string) == 0) {
         //g_print("eval apply quote\n");
@@ -162,7 +164,8 @@ MalVal *EVAL(MalVal *ast, Env *env) {
                strcmp("quasiquote", a0->val.string) == 0) {
         //g_print("eval apply quasiquote\n");
         MalVal *a1 = _nth(ast, 1);
-        return EVAL(quasiquote(a1), env);
+        ast = quasiquote(a1);
+        // Continue loop
     } else if ((a0->type & MAL_SYMBOL) &&
                strcmp("defmacro!", a0->val.string) == 0) {
         //g_print("eval apply defmacro!\n");

diff --git a/c/stepA_more.c b/c/stepA_more.c
@@ -153,7 +153,9 @@ MalVal *EVAL(MalVal *ast, Env *env) {
             assert_type(key, MAL_SYMBOL, "let* bind to non-symbol");
             env_set(let_env, key->val.string, EVAL(val, let_env));
         }
-        return EVAL(a2, let_env);
+        ast = a2;
+        env = let_env;
+        // Continue loop
     } else if ((a0->type & MAL_SYMBOL) &&
                strcmp("quote", a0->val.string) == 0) {
         //g_print("eval apply quote\n");
@@ -162,7 +164,8 @@ MalVal *EVAL(MalVal *ast, Env *env) {
                strcmp("quasiquote", a0->val.string) == 0) {
         //g_print("eval apply quasiquote\n");
         MalVal *a1 = _nth(ast, 1);
-        return EVAL(quasiquote(a1), env);
+        ast = quasiquote(a1);
+        // Continue loop
     } else if ((a0->type & MAL_SYMBOL) &&
                strcmp("defmacro!", a0->val.string) == 0) {
         //g_print("eval apply defmacro!\n");

diff --git a/clojure/src/step5_tco.clj b/clojure/src/step5_tco.clj
@@ -43,7 +43,7 @@
           (let [let-env (env/env env)]
             (doseq [[b e] (partition 2 a1)]
               (env/env-set let-env b (EVAL e let-env)))
-            (EVAL a2 let-env))
+            (recur a2 let-env))
 
           'do
           (do (eval-ast (->> ast (drop-last) (drop 1)) env)

diff --git a/clojure/src/step6_file.clj b/clojure/src/step6_file.clj
@@ -43,7 +43,7 @@
           (let [let-env (env/env env)]
             (doseq [[b e] (partition 2 a1)]
               (env/env-set let-env b (EVAL e let-env)))
-            (EVAL a2 let-env))
+            (recur a2 let-env))
 
           'do
           (do (eval-ast (->> ast (drop-last) (drop 1)) env)

diff --git a/clojure/src/step7_quote.clj b/clojure/src/step7_quote.clj
@@ -60,13 +60,13 @@
           (let [let-env (env/env env)]
             (doseq [[b e] (partition 2 a1)]
               (env/env-set let-env b (EVAL e let-env)))
-            (EVAL a2 let-env))
+            (recur a2 let-env))
 
           'quote
           a1
 
           'quasiquote
-          (EVAL (quasiquote a1) env)
+          (recur (quasiquote a1) env)
 
           'do
           (do (eval-ast (->> ast (drop-last) (drop 1)) env)

diff --git a/clojure/src/step8_macros.clj b/clojure/src/step8_macros.clj
@@ -78,13 +78,13 @@
               (let [let-env (env/env env)]
                 (doseq [[b e] (partition 2 a1)]
                   (env/env-set let-env b (EVAL e let-env)))
-                (EVAL a2 let-env))
+                (recur a2 let-env))
 
               'quote
               a1
 
               'quasiquote
-              (EVAL (quasiquote a1) env)
+              (recur (quasiquote a1) env)
 
               'defmacro!
               (let [func (with-meta (EVAL a2 env)

diff --git a/clojure/src/step9_interop.clj b/clojure/src/step9_interop.clj
@@ -78,13 +78,13 @@
               (let [let-env (env/env env)]
                 (doseq [[b e] (partition 2 a1)]
                   (env/env-set let-env b (EVAL e let-env)))
-                (EVAL a2 let-env))
+                (recur a2 let-env))
 
               'quote
               a1
 
               'quasiquote
-              (EVAL (quasiquote a1) env)
+              (recur (quasiquote a1) env)
 
               'defmacro!
               (let [func (with-meta (EVAL a2 env)

diff --git a/clojure/src/stepA_more.clj b/clojure/src/stepA_more.clj
@@ -78,13 +78,13 @@
               (let [let-env (env/env env)]
                 (doseq [[b e] (partition 2 a1)]
                   (env/env-set let-env b (EVAL e let-env)))
-                (EVAL a2 let-env))
+                (recur a2 let-env))
 
               'quote
               a1
 
               'quasiquote
-              (EVAL (quasiquote a1) env)
+              (recur (quasiquote a1) env)
 
               'defmacro!
               (let [func (with-meta (EVAL a2 env)

diff --git a/cs/step5_tco.cs b/cs/step5_tco.cs
@@ -81,7 +81,9 @@ static MalVal EVAL(MalVal orig_ast, Env env) {
                     val = ((MalList)a1)[i+1];
                     let_env.set(key.getName(), EVAL(val, let_env));
                 }
-                return EVAL(a2, let_env);
+                orig_ast = a2;
+                env = let_env;
+                break;
             case "do":
                 eval_ast(ast.slice(1, ast.size()-1), env);
                 orig_ast = ast[ast.size()-1];

diff --git a/cs/step6_file.cs b/cs/step6_file.cs
@@ -82,7 +82,9 @@ static MalVal EVAL(MalVal orig_ast, Env env) {
                     val = ((MalList)a1)[i+1];
                     let_env.set(key.getName(), EVAL(val, let_env));
                 }
-                return EVAL(a2, let_env);
+                orig_ast = a2;
+                env = let_env;
+                break;
             case "do":
                 eval_ast(ast.slice(1, ast.size()-1), env);
                 orig_ast = ast[ast.size()-1];

diff --git a/cs/step7_quote.cs b/cs/step7_quote.cs
@@ -109,11 +109,14 @@ static MalVal EVAL(MalVal orig_ast, Env env) {
                     val = ((MalList)a1)[i+1];
                     let_env.set(key.getName(), EVAL(val, let_env));
                 }
-                return EVAL(a2, let_env);
+                orig_ast = a2;
+                env = let_env;
+                break;
             case "quote":
                 return ast[1];
             case "quasiquote":
-                return EVAL(quasiquote(ast[1]), env);
+                orig_ast = quasiquote(ast[1]);
+                break;
             case "do":
                 eval_ast(ast.slice(1, ast.size()-1), env);
                 orig_ast = ast[ast.size()-1];

diff --git a/cs/step8_macros.cs b/cs/step8_macros.cs
@@ -136,11 +136,14 @@ static MalVal EVAL(MalVal orig_ast, Env env) {
                     val = ((MalList)a1)[i+1];
                     let_env.set(key.getName(), EVAL(val, let_env));
                 }
-                return EVAL(a2, let_env);
+                orig_ast = a2;
+                env = let_env;
+                break;
             case "quote":
                 return ast[1];
             case "quasiquote":
-                return EVAL(quasiquote(ast[1]), env);
+                orig_ast = quasiquote(ast[1]);
+                break;
             case "defmacro!":
                 a1 = ast[1];
                 a2 = ast[2];