implement new slimefun swank:lookup-and-save-presented-object-or-lose

[swankr.git] / swank-presentations.R

diff --git a/swank-presentations.R b/swank-presentations.R
index 0832fafd931b59bcb6177f4b13781d8a9bec4417..69488cfa9dd7f954b60d1bbd0d9012e979db18c7 100644 (file)
--- a/swank-presentations.R
+++ b/swank-presentations.R
@@ -4,6 +4,8 @@ savePresentedObject <- function(slimeConnection, value) {
   if(!exists("idToObject", envir=slimeConnection)) {
     assign("idToObject", new.env(), envir=slimeConnection)
   }
+  ## FIXME this should check for value already being present in the
+  ## idToObject map
   presentationCounter <<- presentationCounter + 1
   assign(as.character(presentationCounter), value, envir=slimeConnection$idToObject)
   presentationCounter
@@ -27,7 +29,6 @@ sendReplResultFunction <- presentReplResult
 }
 
 `swank:lookup-presented-object` <- function(slimeConnection, sldbState, id) {
-  str(ls(slimeConnection))
   if(exists(as.character(id), envir=slimeConnection$idToObject)) {
     value <- get(as.character(id), envir=slimeConnection$idToObject)
     list(value, TRUE)
@@ -44,7 +45,12 @@ sendReplResultFunction <- presentReplResult
     stop(sprintf("attempt to access unrecorded object (id %d)", id))
   }
 }
-    
+
+`swank:lookup-and-save-presented-object-or-lose` <- function(slimeConnection, sldbState, id) {
+  obj <- `swank:lookup-presented-object-or-lose`(slimeConnection, sldbState, id)
+  savePresentedObject(slimeConnection, obj)
+}
+
 `swank:clear-repl-results` <- function(slimeConnection, sldbState) {
   if(!exists("idToObject", envir=slimeConnection)) {
     assign("idToObject", new.env(), envir=slimeConnection)