This fixes bug #1. It is somewhat on the risky side given that there
are current known protocol problems in the presence of non-ASCII
encodings, but it does make working in the slime repl much more
pleasant.
#+AUTHOR: Christophe Rhodes
#+EMAIL: csr21@cantab.net
#+OPTIONS: H:0 toc:nil
#+AUTHOR: Christophe Rhodes
#+EMAIL: csr21@cantab.net
#+OPTIONS: H:0 toc:nil
-* OPEN #1 printed output not redirected to slime repl :MINOR:
+* RESOLVED #1 printed output not redirected to slime repl :MINOR:FIXED:
The output from functions performing printing is sent to the
standard output of the process running =swank()=, not to an emacs
stream.
The output from functions performing printing is sent to the
standard output of the process running =swank()=, not to an emacs
stream.
}
dispatch <- function(slimeConnection, event, sldbState=NULL) {
}
dispatch <- function(slimeConnection, event, sldbState=NULL) {
kind <- event[[1]]
if(kind == quote(`:emacs-rex`)) {
do.call("emacsRex", c(list(slimeConnection), list(sldbState), event[-1]))
kind <- event[[1]]
if(kind == quote(`:emacs-rex`)) {
do.call("emacsRex", c(list(slimeConnection), list(sldbState), event[-1]))
sendToEmacs <- function(slimeConnection, obj) {
io <- slimeConnection$io
sendToEmacs <- function(slimeConnection, obj) {
io <- slimeConnection$io
payload <- writeSexpToString(obj)
writeChar(sprintf("%06x", nchar(payload)), io, eos=NULL)
writeChar(payload, io, eos=NULL)
flush(io)
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) {
}
callify <- function(form) {
emacsRex <- function(slimeConnection, sldbState, form, pkg, thread, id, level=0) {
ok <- FALSE
value <- NULL
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)
tryCatch({
withCallingHandlers({
call <- callify(form)
+ 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) {
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)) })},
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) {
}
makeSldbState <- function(condition, level, id) {
for(contrib in contribs) {
filename <- sprintf("%s.R", as.character(contrib))
if(file.exists(filename)) {
for(contrib in contribs) {
filename <- sprintf("%s.R", as.character(contrib))
if(file.exists(filename)) {
- source(filename, verbose=TRUE)