X-Git-Url: http://christophe.rhodes.io/gitweb/?p=swankr.git;a=blobdiff_plain;f=swank.R;h=38160edd339acda845dbb40a40b5d3c15eaeca2c;hp=59686299ec29b887d015e7d9c4fee76b8fe6ba04;hb=04218c0c1af88835d1d2e68d97c6e644b7afae35;hpb=3bf571b71b14d5d953c84b0158e5d25a60663083

diff --git a/swank.R b/swank.R
index 5968629..38160ed 100644
--- a/swank.R
+++ b/swank.R
@@ -344,8 +344,12 @@ sendReplResultFunction <- sendReplResult
   list()
 }
 
+`swank:clear-repl-variables` <- function(slimeConnection, sldbState) {
+  list()
+}
+
 `swank:autodoc` <- function(slimeConnection, sldbState, rawForm, ...) {
-  "No Arglist Information"
+  list("No Arglist Information", TRUE)
 }
 
 `swank:operator-arglist` <- function(slimeConnection, sldbState, op, package) {
@@ -361,6 +365,22 @@ sendReplResultFunction <- sendReplResult
   }
 }
 
+`swank:describe-function` <- function(slimeConnection, sldbState, op, package) {
+  ## FIXME: maybe not the best match?
+  `swank:operator-arglist`(slimeConnection, sldbState, op, package)
+}
+
+helpFilesWithTopicString <- function(value) {
+  output <- capture.output(tools:::Rd2txt(utils:::.getHelpFile(value),
+                                          options=list(underline_titles=FALSE)))
+  paste(output, collapse="\n")
+}
+
+`swank:describe-symbol` <- function(slimeConnection, sldbState, op, package) {
+  value <- help(op)
+  helpFilesWithTopicString(value)
+}
+
 `swank:throw-to-toplevel` <- function(slimeConnection, sldbState) {
   condition <- simpleCondition("Throw to toplevel")
   class(condition) <- c("swankTopLevel", class(condition))
@@ -454,43 +474,46 @@ computeRestartsForEmacs <- function (sldbState) {
        list())
 }
 
-`swank:simple-completions` <- function(slimeConnection, sldbState, prefix, package) {
-  symbolFieldsCompletion <- function(object, rest) {
-    ## FIXME: this is hacky, ignoring several syntax issues (use of
-    ## and/or necessity for backquoting identifiers: e.g. fields
-    ## containing hyphens)
-    if((dollar <- regexpr("$", rest, fixed=TRUE)) == -1) {
-      matches <- grep(sprintf("^%s", literal2rx(rest)), names(object), value=TRUE)
-      matches <- sprintf("%s$%s", gsub("\\$[^$]*$", "", prefix), matches)
-      returnMatches(matches)
+symbolFieldsCompletion <- function(object, prefix, rest) {
+  ## FIXME: this is hacky, ignoring several syntax issues (use of
+  ## and/or necessity for backquoting identifiers: e.g. fields
+  ## containing hyphens)
+  if((dollar <- regexpr("$", rest, fixed=TRUE)) == -1) {
+    matches <- grep(sprintf("^%s", literal2rx(rest)), names(object), value=TRUE)
+    matches <- sprintf("%s$%s", gsub("\\$[^$]*$", "", prefix), matches)
+    returnMatches(matches)
+  } else {
+    if(exists(substr(rest, 1, dollar-1), object)) {
+      symbolFieldsCompletion(get(substr(rest, 1, dollar-1), object), prefix, substr(rest, dollar+1, nchar(rest)))
     } else {
-      if(exists(substr(rest, 1, dollar-1), object)) {
-        symbolFieldsCompletion(get(substr(rest, 1, dollar-1), object), substr(rest, dollar+1, nchar(rest)))
-      } else {
-        returnMatches(character(0))
-      }
+      returnMatches(character(0))
     }
   }
-  returnMatches <- function(matches) {
-    nmatches <- length(matches)
-    if(nmatches == 0) {
-      list(list(), "")
-    } else {
-      longest <- matches[order(nchar(matches))][1]
-      while(length(grep(sprintf("^%s", literal2rx(longest)), matches)) < nmatches) {
-        longest <- substr(longest, 1, nchar(longest)-1)
-      }
-      list(as.list(matches), longest)
+}
+
+returnMatches <- function(matches) {
+  nmatches <- length(matches)
+  if(nmatches == 0) {
+    list(list(), "")
+  } else {
+    longest <- matches[order(nchar(matches))][1]
+    while(length(grep(sprintf("^%s", literal2rx(longest)), matches)) < nmatches) {
+      longest <- substr(longest, 1, nchar(longest)-1)
     }
+    list(as.list(matches), longest)
   }
-  literal2rx <- function(string) {
-    ## list of ERE metacharacters from ?regexp
-    gsub("([.\\|()[{^$*+?])", "\\\\\\1", string)
-  }
+}
+
+literal2rx <- function(string) {
+  ## list of ERE metacharacters from ?regexp
+  gsub("([.\\|()[{^$*+?])", "\\\\\\1", string)
+}
+
+`swank:simple-completions` <- function(slimeConnection, sldbState, prefix, package) {
   matches <- apropos(sprintf("^%s", literal2rx(prefix)), ignore.case=FALSE)
   nmatches <- length(matches)
   if((nmatches == 0) && ((dollar <- regexpr("$", prefix, fixed=TRUE)) > -1)) {
-    symbolFieldsCompletion(globalenv(), prefix)
+    symbolFieldsCompletion(globalenv(), prefix, prefix)
   } else {
     returnMatches(matches)
   }
@@ -514,6 +537,23 @@ computeRestartsForEmacs <- function (sldbState) {
                     ifelse(x[3]==1, x[6]+colOffset-1, x[6]))))
   }
   transformSrcrefs <- function(s) {
+    ## horrendous KLUDGE: we need to short-circuit here for "name"
+    ## objects, rather than having a nice uniform behaviour, because
+    ## for expressions of the form x[y,] there is an empty "name"
+    ## which ends up becoming a `missing' object when passed through
+    ## the switch; why, I do not know, but it is then impossible to
+    ## return it, because returning it attempts to evaluate it and
+    ## evaluating it is an error.  Fortunately it appears that names
+    ## don't have srcrefs attached.
+    if(mode(s) == "name") {
+      return(s)
+    }
+    if(is(s, "srcref")) {
+      ## more monumental KLUDGE: parsing (in 2.14, at least) appears
+      ## to put srcrefs directly in `length 2' objects, which we need
+      ## to frob directly.
+      return(frob(list(s))[[1]])
+    }
     srcrefs <- attr(s, "srcref")
     attribs <- attributes(s)
     new <- 
@@ -525,6 +565,9 @@ computeRestartsForEmacs <- function (sldbState) {
     if(!is.null(attr(s, "srcref"))) {
       attr(new, "srcref") <- frob(srcrefs)
     }
+    if(!is.null(attr(s, "wholeSrcref"))) {
+      attr(new, "wholeSrcref") <- frob(list(attr(s, "wholeSrcref")))[[1]]
+    }
     new
   }
   withRestarts({