Change quasiquote algorithm

[jackhill/mal.git] / impls / ocaml / step7_quote.ml

diff --git a/impls/ocaml/step7_quote.ml b/impls/ocaml/step7_quote.ml
index 8598a2d..e1fd16f 100644 (file)
--- a/impls/ocaml/step7_quote.ml
+++ b/impls/ocaml/step7_quote.ml
@@ -5,14 +5,16 @@ let repl_env = Env.make (Some Core.ns)
 let rec quasiquote ast =
   match ast with
     | T.List   { T.value = [T.Symbol {T.value = "unquote"}; ast] } -> ast
-    | T.Vector { T.value = [T.Symbol {T.value = "unquote"}; ast] } -> ast
-    | T.List   { T.value = T.List { T.value = [T.Symbol {T.value = "splice-unquote"}; head]} :: tail }
-    | T.Vector { T.value = T.List { T.value = [T.Symbol {T.value = "splice-unquote"}; head]} :: tail } ->
-       Types.list [Types.symbol "concat"; head; quasiquote (Types.list tail)]
-    | T.List   { T.value = head :: tail }
-    | T.Vector { T.value = head :: tail } ->
-       Types.list [Types.symbol "cons"; quasiquote head; quasiquote (Types.list tail) ]
-    | ast -> Types.list [Types.symbol "quote"; ast]
+    | T.List {T.value = xs} -> List.fold_right qq_folder xs (Types.list [])
+    | T.Vector {T.value = xs} -> Types.list [Types.symbol "vec";
+                                             List.fold_right qq_folder xs (Types.list [])]
+    | T.Map    _ -> Types.list [Types.symbol "quote"; ast]
+    | T.Symbol _ -> Types.list [Types.symbol "quote"; ast]
+    | _ -> ast
+and qq_folder elt acc =
+  match elt with
+    | T.List {T.value = [T.Symbol {T.value = "splice-unquote"}; x]} -> Types.list [Types.symbol "concat"; x; acc]
+    | _ -> Types.list [Types.symbol "cons"; quasiquote elt; acc]
 
 let rec eval_ast ast env =
   match ast with
@@ -70,6 +72,8 @@ and eval ast env =
               in bind_args arg_names args;
               eval expr sub_env)
     | T.List { T.value = [T.Symbol { T.value = "quote" }; ast] } -> ast
+    | T.List { T.value = [T.Symbol { T.value = "quasiquoteexpand" }; ast] } ->
+       quasiquote ast
     | T.List { T.value = [T.Symbol { T.value = "quasiquote" }; ast] } ->
        eval (quasiquote ast) env
     | T.List _ ->