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
implement swank:interactive-eval-region
[swankr.git]
/
swank.R
diff --git
a/swank.R
b/swank.R
index 0384004ac87866fdf79bc4b99d072f954fde17ae..8c5bafdccd1d5d198f534d971db0455fba703095 100644
(file)
--- a/
swank.R
+++ b/
swank.R
@@
-210,7
+210,14
@@
readSexpFromString <- function(string) {
} else if(grepl("^[0-9]+\\.[0-9]+$", token)) {
as.double(token)
} else {
} else if(grepl("^[0-9]+\\.[0-9]+$", token)) {
as.double(token)
} else {
- as.name(token)
+ name <- as.name(token)
+ if(name == quote(t)) {
+ TRUE
+ } else if(name == quote(nil)) {
+ FALSE
+ } else {
+ name
+ }
}
}
readToken <- function() {
}
}
readToken <- function() {
@@
-304,8
+311,10
@@
sendReplResult <- function(slimeConnection, value) {
sendReplResultFunction <- sendReplResult
`swank:listener-eval` <- function(slimeConnection, sldbState, string) {
sendReplResultFunction <- sendReplResult
`swank:listener-eval` <- function(slimeConnection, sldbState, string) {
+ ## O how ugly
string <- gsub("#\\.\\(swank:lookup-presented-object-or-lose([^)]*)\\)", ".(`swank:lookup-presented-object-or-lose`(slimeConnection, sldbState,\\1))", string)
expr <- parse(text=string)[[1]]
string <- gsub("#\\.\\(swank:lookup-presented-object-or-lose([^)]*)\\)", ".(`swank:lookup-presented-object-or-lose`(slimeConnection, sldbState,\\1))", string)
expr <- parse(text=string)[[1]]
+ ## O maybe this is even uglier
lookedup <- do.call("bquote", list(expr))
value <- eval(lookedup, envir = globalenv())
sendReplResultFunction(slimeConnection, value)
lookedup <- do.call("bquote", list(expr))
value <- eval(lookedup, envir = globalenv())
sendReplResultFunction(slimeConnection, value)
@@
-370,8
+379,16
@@
computeRestartsForEmacs <- function (sldbState) {
if(is.null(srcfile)) {
list(quote(`:error`), "no srcfile")
} else {
if(is.null(srcfile)) {
list(quote(`:error`), "no srcfile")
} 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(quote(`:location`),
list(quote(`:location`),
- list(quote(`:file`),
sprintf("%s/%s", srcfile$wd, srcfile$filename)
),
+ list(quote(`:file`),
file
),
list(quote(`:line`), srcref[[1]], srcref[[2]]-1),
FALSE)
}
list(quote(`:line`), srcref[[1]], srcref[[2]]-1),
FALSE)
}
@@
-477,6
+494,12
@@
withRetryRestart <- function(description, expr) {
list(output, prin1ToString(value))
}
list(output, prin1ToString(value))
}
+`swank:interactive-eval-region` <- function(slimeConnection, sldbState, string) {
+ withRetryRestart("retry SLIME interactive evaluation request",
+ value <- eval(parse(text=string), envir=globalenv()))
+ prin1ToString(value)
+}
+
`swank:find-definitions-for-emacs` <- function(slimeConnection, sldbState, string) {
if(exists(string, envir = globalenv())) {
thing <- get(string, envir = globalenv())
`swank:find-definitions-for-emacs` <- function(slimeConnection, sldbState, string) {
if(exists(string, envir = globalenv())) {
thing <- get(string, envir = globalenv())
@@
-673,11
+696,21
@@
emacsInspect.numeric <- function(numeric) {
}
`swank:load-file` <- function(slimeConnection, sldbState, filename) {
}
`swank:load-file` <- function(slimeConnection, sldbState, filename) {
- source(filename, local=FALSE)
+ source(filename, local=FALSE
, keep.source=TRUE
)
TRUE
}
`swank:compile-file-for-emacs` <- function(slimeConnection, sldbState, filename, loadp, ...) {
TRUE
}
`swank:compile-file-for-emacs` <- function(slimeConnection, sldbState, filename, loadp, ...) {
- times <- system.time(parse(filename))
+ times <- system.time(parse(filename, srcfile=srcfile(filename)))
+ if(loadp) {
+ ## KLUDGE: inelegant, but works. It might be more in the spirit
+ ## of things to keep the result of the parse above around to
+ ## evaluate.
+ `swank:load-file`(slimeConnection, sldbState, filename)
+ }
list(quote(`:compilation-result`), list(), TRUE, times[3], substitute(loadp), filename)
}
list(quote(`:compilation-result`), list(), TRUE, times[3], substitute(loadp), filename)
}
+
+`swank:quit-lisp` <- function(slimeConnection, sldbState) {
+ quit()
+}