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
use a similar repl result method in swank-media.R for ggplot objects
[swankr.git]
/
swank.R
diff --git
a/swank.R
b/swank.R
index 34998b652e189799bc6bf70461099f50bc5d68eb..11210e28d415f6f102899b4e9b672d0b352453c4 100644
(file)
--- a/
swank.R
+++ b/
swank.R
@@
-13,15
+13,26
@@
### latest version of the GNU General Public Licence is available at
### <http://www.gnu.org/licenses/gpl.txt>.
### latest version of the GNU General Public Licence is available at
### <http://www.gnu.org/licenses/gpl.txt>.
+### KLUDGE: this assumes that we're being sourced with chdir=TRUE.
+### (If not, `swank:swank-require` will work under the circumstances
+### that it used to work anyway -- i.e. the working directory is the
+### swankr directory)
+swankrPath <- getwd()
+
swank <- function(port=4005) {
acceptConnections(port, FALSE)
}
startSwank <- function(portFile) {
swank <- function(port=4005) {
acceptConnections(port, FALSE)
}
startSwank <- function(portFile) {
- acceptConnections(
FALSE
, portFile)
+ acceptConnections(
4005
, portFile)
}
acceptConnections <- function(port, portFile) {
}
acceptConnections <- function(port, portFile) {
+ if(portFile != FALSE) {
+ f <- file(portFile, open="w+")
+ cat(port, file=f)
+ close(f)
+ }
s <- socketConnection(host="localhost", server=TRUE, port=port, open="r+b")
on.exit(close(s))
serve(s)
s <- socketConnection(host="localhost", server=TRUE, port=port, open="r+b")
on.exit(close(s))
serve(s)
@@
-283,7
+294,7
@@
printToString <- function(val) {
`swank:swank-require` <- function (slimeConnection, sldbState, contribs) {
for(contrib in contribs) {
`swank:swank-require` <- function (slimeConnection, sldbState, contribs) {
for(contrib in contribs) {
- filename <- sprintf("%s
.R"
, as.character(contrib))
+ filename <- sprintf("%s
/%s.R", swankrPath
, as.character(contrib))
if(file.exists(filename)) {
source(filename)
}
if(file.exists(filename)) {
source(filename)
}
@@
-494,6
+505,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())