Christophe
Weblog
Wiki
Code
Publications
Music
projects
/
swankr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add tags to bugs
[swankr.git]
/
swank.R
diff --git
a/swank.R
b/swank.R
index 22cec64d58f898fad9ce4c68b22110bdd4b4c103..747696acdee909c21279cc53c190b2c7919c63ed 100644
(file)
--- a/
swank.R
+++ b/
swank.R
@@
-377,7
+377,6
@@
computeRestartsForEmacs <- function (sldbState) {
}
`swank:frame-locals-and-catch-tags` <- function(slimeConnection, sldbState, index) {
}
`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,
frame <- sldbState$frames[[1+index]]
objs <- ls(envir=frame)
list(lapply(objs, function(name) { list(quote(`:name`), name,
@@
-446,9
+445,16
@@
withRetryRestart <- function(description, expr) {
list()
} else {
filename <- get("filename", srcfile)
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(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())))
}
list(quote(`:line`), srcref[[2]][[1]], srcref[[2]][[2]]-1),
list())))
}
@@
-629,10
+635,6
@@
emacsInspect.numeric <- function(numeric) {
}
`swank:compile-file-for-emacs` <- function(slimeConnection, sldbState, filename, loadp, ...) {
}
`swank:compile-file-for-emacs` <- function(slimeConnection, sldbState, filename, loadp, ...) {
- if(loadp==quote(`t`)) {
- source(filename, local=FALSE)
- } else {
- parse(filename)
- }
- TRUE
+ times <- system.time(parse(filename))
+ list(quote(`:compilation-result`), list(), TRUE, times[3], substitute(loadp), filename)
}
}