R: add time-ms. Readline history. Misc cleanups.

4 files changed, 40 insertions, 7 deletions

diff --git a/r/core.r b/r/core.r
index d0443b0..74c8f6d 100644
--- a/r/core.r
+++ b/r/core.r
@@ -137,6 +137,7 @@ core_ns <- list(
     "-"=function(a,b) a-b,
     "*"=function(a,b) a*b,
     "/"=function(a,b) a/b,
+    "time-ms"=function() round(as.numeric(Sys.time())*1000),
 
     "list"=new.list,
     "list?"=function(a) .list_q(a),
diff --git a/r/readline.r b/r/readline.r
index b842c2b..79ababc 100644
--- a/r/readline.r
+++ b/r/readline.r
@@ -1,16 +1,40 @@
 ..readline.. <- TRUE
 
+HISTORY_FILE = paste(path.expand("~"), "/.mal-history", sep="")
+
 library(rdyncall, lib.loc="lib/")
 
-#rllib <- dynfind(c("edit"))
-rllib <- dynfind(c("readline"))
-rl <- .dynsym(rllib,"readline")
+#.rllib <- dynfind(c("edit"))
+.rllib <- dynfind(c("readline"))
+.call_readline <- .dynsym(.rllib,"readline")
+.call_add_history <- .dynsym(.rllib,"add_history")
 
-readline <- function(prompt) {
-    res <- .dyncall(rl, "Z)p", prompt)
+.state <- new.env()
+.state$rl_history_loaded = FALSE
+
+.readline <- function(prompt) {
+    res <- .dyncall(.call_readline, "Z)p", prompt)
     if (is.nullptr(res)) {
         return(NULL)
     } else {
         return(ptr2str(res))
     }
 }
+
+readline <- function(prompt) {
+    if (!.state$rl_history_loaded) {
+        .state$rl_history_loaded <- TRUE
+
+        lines <- scan(HISTORY_FILE, what="", sep="\n", quiet=TRUE)
+        for(add_line in lines) {
+            .dyncall(.call_add_history, "Z)v", add_line)
+        }
+    }
+
+    line <- .readline(prompt)
+    if (is.null(line)) return(NULL)
+    .dyncall(.call_add_history, "Z)v", line)
+    write(line, file=HISTORY_FILE, append=TRUE)
+
+    line
+}
diff --git a/r/step9_try.r b/r/step9_try.r
index b37fe38..e699048 100644
--- a/r/step9_try.r
+++ b/r/step9_try.r
@@ -176,7 +176,11 @@ Env.set(repl_env, "*ARGV*", new.list())
 args <- commandArgs(trailingOnly = TRUE)
 if (length(args) > 0) {
     Env.set(repl_env, "*ARGV*", new.listl(slice(list(args),2)))
-    . <- rep(concat("(load-file \"", args[[1]], "\")"))
+    tryCatch({
+        . <- rep(concat("(load-file \"", args[[1]], "\")"))
+    }, error=function(err) {
+        cat("Error: ", get_error(err),"\n", sep="")
+    })
     quit(save="no", status=0)
 }
 
diff --git a/r/stepA_interop.r b/r/stepA_interop.r
index b37fe38..e699048 100644
--- a/r/stepA_interop.r
+++ b/r/stepA_interop.r
@@ -176,7 +176,11 @@ Env.set(repl_env, "*ARGV*", new.list())
 args <- commandArgs(trailingOnly = TRUE)
 if (length(args) > 0) {
     Env.set(repl_env, "*ARGV*", new.listl(slice(list(args),2)))
-    . <- rep(concat("(load-file \"", args[[1]], "\")"))
+    tryCatch({
+        . <- rep(concat("(load-file \"", args[[1]], "\")"))
+    }, error=function(err) {
+        cat("Error: ", get_error(err),"\n", sep="")
+    })
     quit(save="no", status=0)
 }