From 1617910ad342a55762f3ddabb975849d843cff85 Mon Sep 17 00:00:00 2001 From: Joel Martin Date: Tue, 1 Apr 2014 23:12:33 -0500 Subject: All: remove slurp-do, use str around slurp instead. --- java/src/main/java/mal/step6_file.java | 8 +------- java/src/main/java/mal/step7_quote.java | 8 +------- java/src/main/java/mal/step8_macros.java | 8 +------- java/src/main/java/mal/stepA_more.java | 9 +-------- 4 files changed, 4 insertions(+), 29 deletions(-) (limited to 'java/src') diff --git a/java/src/main/java/mal/step6_file.java b/java/src/main/java/mal/step6_file.java index 95bfd1c..65d9d38 100644 --- a/java/src/main/java/mal/step6_file.java +++ b/java/src/main/java/mal/step6_file.java @@ -168,15 +168,9 @@ public class step6_file { return new MalString(slurp(fname)); } }); - _ref(repl_env, "slurp-do", new MalFunction() { - public MalVal apply(MalList args) throws MalThrowable { - String fname = ((MalString)args.nth(0)).getValue(); - return new MalString("(do " + slurp(fname) + ")"); - } - }); RE(repl_env, "(def! not (fn* (a) (if a false true)))"); - RE(repl_env, "(def! load-file (fn* (f) (eval (read-string (slurp-do f)))))"); + RE(repl_env, "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))"); Integer fileIdx = 0; if (args.length > 0 && args[0].equals("--raw")) { diff --git a/java/src/main/java/mal/step7_quote.java b/java/src/main/java/mal/step7_quote.java index 49f395e..2a09d3e 100644 --- a/java/src/main/java/mal/step7_quote.java +++ b/java/src/main/java/mal/step7_quote.java @@ -199,15 +199,9 @@ public class step7_quote { return new MalString(slurp(fname)); } }); - _ref(repl_env, "slurp-do", new MalFunction() { - public MalVal apply(MalList args) throws MalThrowable { - String fname = ((MalString)args.nth(0)).getValue(); - return new MalString("(do " + slurp(fname) + ")"); - } - }); RE(repl_env, "(def! not (fn* (a) (if a false true)))"); - RE(repl_env, "(def! load-file (fn* (f) (eval (read-string (slurp-do f)))))"); + RE(repl_env, "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))"); Integer fileIdx = 0; if (args.length > 0 && args[0].equals("--raw")) { diff --git a/java/src/main/java/mal/step8_macros.java b/java/src/main/java/mal/step8_macros.java index c632987..47732dd 100644 --- a/java/src/main/java/mal/step8_macros.java +++ b/java/src/main/java/mal/step8_macros.java @@ -237,15 +237,9 @@ public class step8_macros { return new MalString(slurp(fname)); } }); - _ref(repl_env, "slurp-do", new MalFunction() { - public MalVal apply(MalList args) throws MalThrowable { - String fname = ((MalString)args.nth(0)).getValue(); - return new MalString("(do " + slurp(fname) + ")"); - } - }); RE(repl_env, "(def! not (fn* (a) (if a false true)))"); - RE(repl_env, "(def! load-file (fn* (f) (eval (read-string (slurp-do f)))))"); + RE(repl_env, "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))"); Integer fileIdx = 0; if (args.length > 0 && args[0].equals("--raw")) { diff --git a/java/src/main/java/mal/stepA_more.java b/java/src/main/java/mal/stepA_more.java index ff09aff..d3bb161 100644 --- a/java/src/main/java/mal/stepA_more.java +++ b/java/src/main/java/mal/stepA_more.java @@ -279,18 +279,11 @@ public class stepA_more { return new MalString(slurp(fname)); } }); - _ref(repl_env, "slurp-do", new MalFunction() { - public MalVal apply(MalList args) throws MalThrowable { - String fname = ((MalString)args.nth(0)).getValue(); - return new MalString("(do " + slurp(fname) + ")"); - } - }); RE(repl_env, "(def! not (fn* (a) (if a false true)))"); RE(repl_env, "(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)))))))"); RE(repl_env, "(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))))))))"); - - RE(repl_env, "(def! load-file (fn* (f) (eval (read-string (slurp-do f)))))"); + RE(repl_env, "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))"); Integer fileIdx = 0; if (args.length > 0 && args[0].equals("--raw")) { -- cgit v1.2.3