X-Git-Url: http://christophe.rhodes.io/gitweb/?p=swankr.git;a=blobdiff_plain;f=swank.R;h=a826c7a7a250115a88e8dc8ace283bf7da9a035c;hp=488ad56943417d0414b9eba804fc14d63cd0a4b1;hb=277c935e6f2d9f32bcd0786a71cf4b02e094f4d6;hpb=df9e80e09eb7639969fbcdb57899efe72688486b

diff --git a/swank.R b/swank.R
index 488ad56..a826c7a 100644
--- a/swank.R
+++ b/swank.R
@@ -245,16 +245,19 @@ writeSexpToString <- function(obj) {
   writeSexpToStringLoop(obj)
 }
 
-printToString <- function(val) {
+withOutputToString <- function(expr) {
+  call <- substitute(expr)
   f <- fifo("")
   sink(f)
-  tryCatch({
-    tryCatch(str(val, indent.str="", list.len=5, max.level=2),
-             finally=sink())
-    readLines(f) },
+  tryCatch({ tryCatch(eval.parent(call), finally=sink())
+             readLines(f) },
            finally=close(f))
 }
 
+printToString <- function(val) {
+  withOutputToString(str(val, indent.str="", list.len=5, max.level=2))
+}
+
 `swank:connection-info` <- function (slimeConnection, sldbState) {
   list(quote(`:pid`), Sys.getpid(),
        quote(`:package`), list(quote(`:name`), "R", quote(`:prompt`), "R> "),
@@ -412,15 +415,11 @@ computeRestartsForEmacs <- function (sldbState) {
 `swank:eval-and-grab-output` <- function(slimeConnection, sldbState, string) {
   retry <- TRUE
   value <- ""
-  output <- NULL
-  f <- fifo("")
-  tryCatch({
-    sink(f)
-    while(retry) {
+  output <-
+    withOutputToString(while(retry) {
       retry <- FALSE
       withRestarts(value <- eval(parse(text=string), envir = globalenv()),
-                   retry=list(description="retry SLIME interactive evaluation request", handler=function() retry <<- TRUE))}},
-           finally={sink(); output <- readLines(f); close(f)})
+                   retry=list(description="retry SLIME interactive evaluation request", handler=function() retry <<- TRUE))})
   list(output, printToString(value))
 }