Change quasiquote algorithm

[jackhill/mal.git] / process / step8_macros.txt

diff --git a/process/step8_macros.txt b/process/step8_macros.txt
index 29f5bdf..42a5dc5 100644 (file)
--- a/process/step8_macros.txt
+++ b/process/step8_macros.txt
@@ -3,7 +3,6 @@ import types, reader, printer, env, core
 
 READ(str): return reader.read_str(str)
 
-pair?(ast): return ... // true if non-empty sequence
 quasiquote(ast): return ... // quasiquote
 
 macro?(ast, env): return ... // true if macro call
@@ -22,6 +21,7 @@ EVAL(ast,env):
 
     ast = macroexpand(ast, env)
     if not list?(ast): return eval_ast(ast, env)
+    if empty?(ast): return ast
 
     switch ast[0]:
       'def!:        return env.set(ast[1], EVAL(ast[2], env))
@@ -49,9 +49,8 @@ repl_env.set('*ARGV*, cmdline_args[1..])
 
 ;; core.mal: defined using the language itself
 rep("(def! not (fn* (a) (if a false true)))")
-rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))")
+rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))")
 rep("(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)))))))");
-rep("(defmacro! or (fn* (& xs) (if (empty? xs) nil (if (= 1 (count xs)) (first xs) `(let* (or_FIXME ~(first xs)) (if or_FIXME or_FIXME (or ~@(rest xs))))))))");
 
 if cmdline_args: rep("(load-file \"" + args[0] + "\")"); exit 0
 
@@ -93,6 +92,7 @@ ns = {'=:        equal?,
 
       'cons:     (a) -> concat([a[0]], a[1]),
       'concat:   (a) -> reduce(concat, [], a),
+      'vec:      (l) -> l converted to vector,
       'nth:      (a) -> a[0][a[1]] OR raise "nth: index out of range",
       'first:    (a) -> a[0][0] OR nil,
       'rest:     (a) -> a[0][1..] OR list(),