X-Git-Url: http://christophe.rhodes.io/gitweb/?p=swankr.git;a=blobdiff_plain;f=swank.R;h=f395217bf92abe79767a55c5434bc015bb003781;hp=18269449e914970f099c240fc916ead34f11c159;hb=2d372ae85cf0f1eacb4c44e3615499e0a29bf6b6;hpb=574dfdfecdc1bb179c60e79e680092469303404a

diff --git a/swank.R b/swank.R
index 1826944..f395217 100644
--- a/swank.R
+++ b/swank.R
@@ -65,7 +65,7 @@ makeSldbState <- function(condition, level, id) {
 
 sldbLoop <- function(io, sldbState, id) {
   tryCatch({
-    sendToEmacs(io, c(list(quote(`:debug`), id, sldbState$level), debuggerInfoForEmacs(sldbState)))
+    sendToEmacs(io, c(list(quote(`:debug`), id, sldbState$level), `swank:debugger-info-for-emacs`(io, sldbState)))
     sendToEmacs(io, list(quote(`:debug-activate`), id, sldbState$level, FALSE))
     while(TRUE) {
       dispatch(io, readPacket(io), sldbState)
@@ -73,29 +73,6 @@ sldbLoop <- function(io, sldbState, id) {
   }, finally=sendToEmacs(io, c(list(quote(`:debug-return`), id, sldbState$level, FALSE))))
 }
 
-debuggerInfoForEmacs <- function(sldbState, from=0, to=NULL) {
-  backtraceForEmacs <- function() {
-    calls <- sldbState$calls
-    if(is.null(to)) to <- length(calls)
-    from <- from+1
-    calls <- lapply(calls[from:to], { frameNumber <- from-1;
-                             function (x) { ret <- list(frameNumber, paste(format(x), sep="", collapse=" ")); frameNumber <<- 1+frameNumber; ret }})
-  }
-  computeRestartsForEmacs <- function () {
-    lapply(sldbState$restarts,
-           function(x) {
-             ## this is all a little bit internalsy
-             restartName <- x[[1]][[1]]
-             description <- restartDescription(x)
-             list(restartName, if(is.null(description)) restartName else description)
-           })
-  }
-  list(list(as.character(sldbState$condition), sprintf("  [%s]", class(sldbState$condition)[[1]]), FALSE),
-       computeRestartsForEmacs(),
-       backtraceForEmacs(),
-       list(sldbState$id))
-}
-
 readPacket <- function(io) {
   header <- readChunk(io, 6)
   len <- strtoi(header, base=16)
@@ -270,8 +247,35 @@ printToString <- function(val) {
   signalCondition(condition)
 }
 
-`swank:debugger-info-for-emacs` <- function(io, sldbState, from, to) {
-  debuggerInfoForEmacs(sldbState, from=from, to=to)
+`swank:backtrace` <- function(io, sldbState, from=0, to=NULL) {
+  calls <- sldbState$calls
+  if(is.null(to)) to <- length(calls)
+  from <- from+1
+  calls <- lapply(calls[from:to],
+                  { frameNumber <- from-1;
+                    function (x) {
+                      ret <- list(frameNumber, paste(format(x), sep="", collapse=" "))
+                      frameNumber <<- 1+frameNumber
+                      ret
+                    }
+                  })
+}
+
+computeRestartsForEmacs <- function (sldbState) {
+  lapply(sldbState$restarts,
+         function(x) {
+           ## this is all a little bit internalsy
+           restartName <- x[[1]][[1]]
+           description <- restartDescription(x)
+           list(restartName, if(is.null(description)) restartName else description)
+         })
+}
+
+`swank:debugger-info-for-emacs` <- function(io, sldbState, from=0, to=NULL) {
+  list(list(as.character(sldbState$condition), sprintf("  [%s]", class(sldbState$condition)[[1]]), FALSE),
+       computeRestartsForEmacs(sldbState),
+       `swank:backtrace`(io, sldbState, from, to),
+       list(sldbState$id))
 }
 
 `swank:invoke-nth-restart-for-emacs` <- function(io, sldbState, level, n) {
@@ -280,6 +284,21 @@ printToString <- function(val) {
   }
 }
 
+`swank:frame-source-location` <- function(io, sldbState, n) {
+  call <- sldbState$calls[[n+1]]
+  srcref <- attr(call, "srcref")
+  srcfile <- attr(srcref, "srcfile")
+  if(is.null(srcfile)) {
+    list(quote(`:error`), "no srcfile")
+  } else {
+    filename <- get("filename", srcfile)
+    list(quote(`:location`),
+         list(quote(`:file`), filename),
+         list(quote(`:line`), srcref[[1]], srcref[[2]]-1),
+         FALSE)
+  }
+}
+
 `swank:buffer-first-change` <- function(io, sldbState, filename) {
   FALSE
 }