X-Git-Url: https://git.hcoop.net/jackhill/mal.git/blobdiff_plain/29ba1fb6c0e5668a7c1feaa9b7a7d40a7f4bc8c3..26ced15b31c6ebfd77c7297a7f8d346ff08c3f9b:/r/stepA_mal.r

diff --git a/r/stepA_mal.r b/r/stepA_mal.r
index 1240a591..2d610526 100644
--- a/r/stepA_mal.r
+++ b/r/stepA_mal.r
@@ -75,13 +75,12 @@ EVAL <- function(ast, env) {
     repeat {
 
     #cat("EVAL: ", .pr_str(ast,TRUE), "\n", sep="")
-    if (!.list_q(ast)) {
-        return(eval_ast(ast, env))
-    }
+    if (!.list_q(ast)) { return(eval_ast(ast, env)) }
+    if (length(ast) == 0) { return(ast) }
 
     # apply list
     ast <- macroexpand(ast, env)
-    if (!.list_q(ast)) return(ast)
+    if (!.list_q(ast)) return(eval_ast(ast, env))
 
     switch(paste("l",length(ast),sep=""),
            l0={ return(ast) },
@@ -122,7 +121,7 @@ EVAL <- function(ast, env) {
                                          new.list(a2[[2]]),
                                          new.list(edata$exc))))
         } else {
-            throw(err)
+            throw(edata$exc)
         }
     } else if (a0sym == "do") {
         eval_ast(slice(ast,2,length(ast)-1), env)
@@ -170,14 +169,11 @@ Env.set(repl_env, "*ARGV*", new.list())
 . <- rep("(def! not (fn* (a) (if a false true)))")
 . <- rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))")
 . <- 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("(def! *gensym-counter* (atom 0))")
-. <- rep("(def! gensym (fn* [] (symbol (str \"G__\" (swap! *gensym-counter* (fn* [x] (+ 1 x)))))))")
-. <- rep("(defmacro! or (fn* (& xs) (if (empty? xs) nil (if (= 1 (count xs)) (first xs) (let* (condvar (gensym)) `(let* (~condvar ~(first xs)) (if ~condvar ~condvar (or ~@(rest xs)))))))))")
 
 
 args <- commandArgs(trailingOnly = TRUE)
 if (length(args) > 0) {
-    Env.set(repl_env, "*ARGV*", new.listl(slice(list(args),2)))
+    Env.set(repl_env, "*ARGV*", new.listl(slice(as.list(args),2)))
     tryCatch({
         . <- rep(concat("(load-file \"", args[[1]], "\")"))
     }, error=function(err) {
@@ -193,7 +189,7 @@ repeat {
     tryCatch({
         cat(rep(line),"\n", sep="")
     }, error=function(err) {
-        cat("Error: ", get_error(err),"\n", sep="")
+        cat("Error: ", .pr_str(get_error(err),TRUE),"\n", sep="")
     })
     # R debug/fatal with tracebacks:
     #cat(rep(line),"\n", sep="")