[slime-cvs] CVS slime

[mbaringer]

Update of /project/slime/cvsroot/slime
In directory clnet:/tmp/cvs-serv20454

Modified Files:
	swank.lisp 
Log Message:
(format-arglist-for-echo-area): Instead of using let+first+rest to
destructure a form use destructuring-bind.
(lookup-presented-object): Added (declare (special *inspectee-parts*))
to silence openmcl's compiler.
(inspect-object): Generate, and send to emacs, an ID for the object
being inspected.


--- /project/slime/cvsroot/slime/swank.lisp	2006/08/27 11:01:43	1.396
+++ /project/slime/cvsroot/slime/swank.lisp	2006/09/13 14:31:41	1.397
@@ -2195,8 +2195,8 @@
                                      highlight)
   "Return the arglist for FORM as a string."
   (when (consp form)
-    (let ((operator-form (first form))
-          (argument-forms (rest form)))
+    (destructuring-bind (operator-form &rest argument-forms)
+        form
       (let ((form-completion 
              (form-completion operator-form argument-forms
                               :remove-args nil)))
@@ -2317,7 +2317,8 @@
 
 (defvar *nil-surrogate* (make-symbol "nil-surrogate"))
 
-;; XXX thread safety?
+;; XXX thread safety? [2006-09-13] mb: not in the slightest (fwiw the
+;; rest of slime isn't thread safe either), do we really care?
 (defun save-presented-object (object)
   "Save OBJECT and return the assigned id.
 If OBJECT was saved previously return the old id."
@@ -2359,6 +2360,7 @@
           (:no-error (value)
             (values value t))))
        ((:inspected-part part-index)
+        (declare (special *inspectee-parts*))
         (if (< part-index (length *inspectee-parts*))
             (values (inspector-nth-part part-index) t)
             (values nil nil)))))))
@@ -4027,10 +4029,7 @@
            (loop for key being the hash-keys of ht
 	      for value being the hash-values of ht
 	      repeat (or *slime-inspect-contents-limit* most-positive-fixnum)
-	      append `((:value ,key) " = " (:value ,value) (:newline))
-	      )
-
-	   )))
+	      append `((:value ,key) " = " (:value ,value) (:newline))))))
 
 (defmethod inspect-bigger-piece-actions (thing size)
   (append 
@@ -4048,8 +4047,7 @@
 	       (let ((*slime-inspect-contents-limit* nil))
 		 (values
 		  (swank::inspect-object thing)
-		  :replace)
-		 ))))
+		  :replace)))))
 
 (defmethod inspect-show-more-action (thing)
   `(:action ,(format nil "~a elements shown. Prompt for how many to inspect..." 
@@ -4059,9 +4057,7 @@
 		      (progn (format t "How many elements should be shown? ") (read))))
 		 (values
 		  (swank::inspect-object thing)
-		  :replace)
-		 ))
-	    ))
+		  :replace)))))
 
 (defmethod inspect-for-emacs ((array array) inspector)
   (declare (ignore inspector))
@@ -4661,7 +4657,8 @@
         (inspect-for-emacs object inspector)
       (list :title title
             :type (to-string (type-of object))
-            :content (inspector-content-for-emacs content)))))
+            :content (inspector-content-for-emacs content)
+            :id (assign-index object *inspectee-parts*)))))
 
 (defslimefun inspector-nth-part (index)
   (aref *inspectee-parts* index))