diff options
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/main/java/mal/core.java | 11 | ||||
| -rw-r--r-- | java/src/main/java/mal/stepA_more.java | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/java/src/main/java/mal/core.java b/java/src/main/java/mal/core.java index ea6787d..0f1d226 100644 --- a/java/src/main/java/mal/core.java +++ b/java/src/main/java/mal/core.java @@ -117,8 +117,10 @@ public class core { public MalVal apply(MalList args) throws MalThrowable { String fname = ((MalString)args.nth(0)).getValue(); try { + // Scanner drops final newline, so add it back return new MalString( - new Scanner(new File(fname)).useDelimiter("\\Z").next()); + new Scanner(new File(fname)).useDelimiter("\\Z").next() + + "\n"); } catch (FileNotFoundException e) { throw new MalError(e.getMessage()); } @@ -169,6 +171,12 @@ public class core { } }; + static MalFunction time_ms = new MalFunction() { + public MalVal apply(MalList a) throws MalThrowable { + return new MalInteger((int)System.currentTimeMillis()); + } + }; + // List functions static MalFunction new_list = new MalFunction() { @@ -480,6 +488,7 @@ public class core { .put("-", subtract) .put("*", multiply) .put("/", divide) + .put("time-ms", time_ms) .put("list", new_list) .put("list?", list_Q) diff --git a/java/src/main/java/mal/stepA_more.java b/java/src/main/java/mal/stepA_more.java index 5ed5667..17bdb16 100644 --- a/java/src/main/java/mal/stepA_more.java +++ b/java/src/main/java/mal/stepA_more.java @@ -245,6 +245,7 @@ public class stepA_more { }); // core.mal: defined using the language itself + RE(repl_env, "(def! *host-language* \"java\")"); RE(repl_env, "(def! not (fn* (a) (if a false true)))"); RE(repl_env, "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))"); 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)))))))"); |