X-Git-Url: http://christophe.rhodes.io/gitweb/?p=swankr.git;a=blobdiff_plain;f=swank.R;h=0384004ac87866fdf79bc4b99d072f954fde17ae;hp=c0adff899a9a8b895f06cf692d53a21cf0b9c6ed;hb=d71a219019f099e6c8a3be18e5ace3f06faaeded;hpb=303d24062c70b2e89370714965736b2bfe380175 diff --git a/swank.R b/swank.R index c0adff8..0384004 100644 --- a/swank.R +++ b/swank.R @@ -42,7 +42,6 @@ mainLoop <- function(io) { } dispatch <- function(slimeConnection, event, sldbState=NULL) { - str(event) kind <- event[[1]] if(kind == quote(`:emacs-rex`)) { do.call("emacsRex", c(list(slimeConnection), list(sldbState), event[-1])) @@ -51,12 +50,10 @@ dispatch <- function(slimeConnection, event, sldbState=NULL) { sendToEmacs <- function(slimeConnection, obj) { io <- slimeConnection$io - str(obj) payload <- writeSexpToString(obj) writeChar(sprintf("%06x", nchar(payload)), io, eos=NULL) writeChar(payload, io, eos=NULL) flush(io) - cat(sprintf("%06x", nchar(payload)), payload, sep="") } callify <- function(form) { @@ -81,15 +78,30 @@ callify <- function(form) { emacsRex <- function(slimeConnection, sldbState, form, pkg, thread, id, level=0) { ok <- FALSE value <- NULL + conn <- textConnection(NULL, open="w") + condition <- NULL tryCatch({ withCallingHandlers({ call <- callify(form) - value <- eval(call) + capture.output(value <- eval(call), file=conn) + string <- paste(textConnectionValue(conn), sep="", collapse="\n") + if(nchar(string) > 0) { + sendToEmacs(slimeConnection, list(quote(`:write-string`), string)) + sendToEmacs(slimeConnection, list(quote(`:write-string`), "\n")) + } + close(conn) ok <- TRUE }, error=function(c) { + condition <<- c + string <- paste(textConnectionValue(conn), sep="", collapse="\n") + if(nchar(string) > 0) { + sendToEmacs(slimeConnection, list(quote(`:write-string`), string)) + sendToEmacs(slimeConnection, list(quote(`:write-string`), "\n")) + } + close(conn) newSldbState <- makeSldbState(c, if(is.null(sldbState)) 0 else sldbState$level+1, id) withRestarts(sldbLoop(slimeConnection, newSldbState, id), abort=paste("return to sldb level", newSldbState$level)) })}, - finally=sendToEmacs(slimeConnection, list(quote(`:return`), if(ok) list(quote(`:ok`), value) else list(quote(`:abort`)), id))) + finally=sendToEmacs(slimeConnection, list(quote(`:return`), if(ok) list(quote(`:ok`), value) else list(quote(`:abort`), as.character(condition)), id))) } makeSldbState <- function(condition, level, id) { @@ -245,17 +257,13 @@ writeSexpToString <- function(obj) { writeSexpToStringLoop(obj) } -withOutputToString <- function(expr) { - call <- substitute(expr) - f <- fifo("") - sink(f) - tryCatch({ tryCatch(eval.parent(call), finally=sink()) - readLines(f) }, - finally=close(f)) +prin1ToString <- function(val) { + paste(deparse(val, backtick=TRUE, control=c("delayPromises", "keepNA")), + sep="", collapse="\n") } printToString <- function(val) { - withOutputToString(str(val, indent.str="", list.len=5, max.level=2)) + paste(capture.output(print(val)), sep="", collapse="\n") } `swank:connection-info` <- function (slimeConnection, sldbState) { @@ -270,7 +278,7 @@ printToString <- function(val) { for(contrib in contribs) { filename <- sprintf("%s.R", as.character(contrib)) if(file.exists(filename)) { - source(filename, verbose=TRUE) + source(filename) } } list() @@ -282,7 +290,7 @@ printToString <- function(val) { makeReplResult <- function(value) { string <- printToString(value) - list(quote(`:write-string`), paste(string, collapse="\n"), + list(quote(`:write-string`), string, quote(`:repl-result`)) } @@ -381,12 +389,11 @@ computeRestartsForEmacs <- function (sldbState) { } `swank:frame-locals-and-catch-tags` <- function(slimeConnection, sldbState, index) { - str(sldbState$frames) frame <- sldbState$frames[[1+index]] objs <- ls(envir=frame) list(lapply(objs, function(name) { list(quote(`:name`), name, quote(`:id`), 0, - quote(`:value`), paste(printToString(eval(parse(text=name), envir=frame)), sep="", collapse="\n")) }), + quote(`:value`), printToString(eval(parse(text=name), envir=frame))) }), list()) } @@ -406,11 +413,42 @@ computeRestartsForEmacs <- function (sldbState) { } `swank:compile-string-for-emacs` <- function(slimeConnection, sldbState, string, buffer, position, filename, policy) { - # FIXME: I think in parse() here we can use srcref to associate - # buffer/filename/position to the objects. Or something. - withRestarts({ times <- system.time(eval(parse(text=string), envir = globalenv())) }, + lineOffset <- charOffset <- colOffset <- NULL + for(pos in position) { + switch(as.character(pos[[1]]), + `:position` = {charOffset <- pos[[2]]}, + `:line` = {lineOffset <- pos[[2]]; colOffset <- pos[[3]]}, + warning("unknown content in pos", pos)) + } + frob <- function(refs) { + lapply(refs, + function(x) + srcref(attr(x,"srcfile"), + c(x[1]+lineOffset-1, ifelse(x[1]==1, x[2]+colOffset-1, x[2]), + x[3]+lineOffset-1, ifelse(x[3]==1, x[4]+colOffset-1, x[4]), + ifelse(x[1]==1, x[5]+colOffset-1, x[5]), + ifelse(x[3]==1, x[6]+colOffset-1, x[6])))) + } + transformSrcrefs <- function(s) { + srcrefs <- attr(s, "srcref") + attribs <- attributes(s) + new <- + switch(mode(s), + "call"=as.call(lapply(s, transformSrcrefs)), + "expression"=as.expression(lapply(s, transformSrcrefs)), + s) + attributes(new) <- attribs + if(!is.null(attr(s, "srcref"))) { + attr(new, "srcref") <- frob(srcrefs) + } + new + } + withRestarts({ + times <- system.time({ + exprs <- parse(text=string, srcfile=srcfile(filename)) + eval(transformSrcrefs(exprs), envir = globalenv()) })}, abort="abort compilation") - list(quote(`:compilation-result`), list(), TRUE, times[3]) + list(quote(`:compilation-result`), list(), TRUE, times[3], FALSE, FALSE) } withRetryRestart <- function(description, expr) { @@ -427,15 +465,16 @@ withRetryRestart <- function(description, expr) { `swank:interactive-eval` <- function(slimeConnection, sldbState, string) { withRetryRestart("retry SLIME interactive evaluation request", value <- eval(parse(text=string), envir=globalenv())) - printToString(value) + prin1ToString(value) } `swank:eval-and-grab-output` <- function(slimeConnection, sldbState, string) { withRetryRestart("retry SLIME interactive evaluation request", { output <- - withOutputToString(value <- eval(parse(text=string), - envir=globalenv())) }) - list(output, printToString(value)) + capture.output(value <- eval(parse(text=string), + envir=globalenv())) }) + output <- paste(output, sep="", collapse="\n") + list(output, prin1ToString(value)) } `swank:find-definitions-for-emacs` <- function(slimeConnection, sldbState, string) { @@ -449,9 +488,16 @@ withRetryRestart <- function(description, expr) { list() } else { filename <- get("filename", srcfile) + ## KLUDGE: what this means is "is the srcfile filename + ## absolute?" + if(substr(filename, 1, 1) == "/") { + file <- filename + } else { + file <- sprintf("%s/%s", srcfile$wd, filename) + } list(list(sprintf("function %s", string), list(quote(`:location`), - list(quote(`:file`), sprintf("%s/%s", srcfile$wd, srcfile$filename)), + list(quote(`:file`), file), list(quote(`:line`), srcref[[2]][[1]], srcref[[2]][[2]]-1), list()))) } @@ -503,7 +549,7 @@ inspectObject <- function(slimeConnection, object) { valuePart <- function(istate, object, string) { list(quote(`:value`), - if(is.null(string)) paste(printToString(object),collapse=" ") else string, + if(is.null(string)) printToString(object) else string, assignIndexInParts(object, istate)) } @@ -616,3 +662,22 @@ emacsInspect.numeric <- function(numeric) { object <- get(name, envir=frame) inspectObject(slimeConnection, object) } + +`swank:default-directory` <- function(slimeConnection, sldbState) { + getwd() +} + +`swank:set-default-directory` <- function(slimeConnection, sldbState, directory) { + setwd(directory) + `swank:default-directory`(slimeConnection, sldbState) +} + +`swank:load-file` <- function(slimeConnection, sldbState, filename) { + source(filename, local=FALSE) + TRUE +} + +`swank:compile-file-for-emacs` <- function(slimeConnection, sldbState, filename, loadp, ...) { + times <- system.time(parse(filename)) + list(quote(`:compilation-result`), list(), TRUE, times[3], substitute(loadp), filename) +}