[slime-cvs] CVS slime

[jsnellman]

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

Modified Files:
	swank.lisp swank-sbcl.lisp swank-backend.lisp ChangeLog 
Log Message:
fix SBCL 0.9.17

--- /project/slime/cvsroot/slime/swank.lisp	2006/09/21 16:56:07	1.401
+++ /project/slime/cvsroot/slime/swank.lisp	2006/09/24 21:52:54	1.402
@@ -3955,7 +3955,7 @@
 (defun sanitize-xrefs (x)
   (remove-duplicates
    (remove-if (lambda (f)
-                (member f '(nil #+sbcl sb-c::step-form)))
+                (member f (ignored-xref-function-names)))
               x
               :key #'car)
    :test (lambda (a b)
--- /project/slime/cvsroot/slime/swank-sbcl.lisp	2006/09/20 18:37:01	1.165
+++ /project/slime/cvsroot/slime/swank-sbcl.lisp	2006/09/24 21:52:55	1.166
@@ -22,6 +22,16 @@
 
 (import-from :sb-gray *gray-stream-symbols* :swank-backend)
 
+;;; backwards compability tests
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  ;; Generate a form suitable for testing for stepper support (0.9.17)
+  ;; with #+.
+  (defun sbcl-with-new-stepper-p ()
+    (if (find-symbol "ENABLE-STEPPING" "SB-IMPL")
+        '(and)
+        '(or))))
+
 ;;; swank-mop
 
 (import-swank-mop-symbols :sb-mop '(:slot-definition-documentation))
@@ -568,6 +578,10 @@
   (let ((fn (fdefinition symbol)))
     (mapcar #'function-dspec (sb-introspect:find-function-callees fn))))
 
+#-#.(swank-backend::sbcl-with-new-stepper-p)
+(defimplementation ignored-xref-function-names ()
+  '(nil sb-c::step-form sb-c::step-values))
+
 (defun function-dspec (fn)
   "Describe where the function FN was defined.
 Return a list of the form (NAME LOCATION)."
@@ -583,14 +597,6 @@
 
 ;;; Debugging
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  ;; Generate a form suitable for testing for stepper support (0.9.17)
-  ;; with #+.
-  (defun sbcl-with-new-stepper-p ()
-    (if (find-symbol "ENABLE-STEPPING" "SB-IMPL")
-        '(and)
-        '(or))))
-
 (defvar *sldb-stack-top*)
 
 (defimplementation install-debugger-globally (function)
--- /project/slime/cvsroot/slime/swank-backend.lisp	2006/09/18 21:56:13	1.103
+++ /project/slime/cvsroot/slime/swank-backend.lisp	2006/09/24 21:52:55	1.104
@@ -732,6 +732,12 @@
   "List the functions called by FUNCTION-NAME.
 See LIST-CALLERS for a description of the return value.")
 
+;;; Utilities
+
+(definterface ignored-xref-function-names ()
+  "List of function names that SANITIZE-XREFS should remove."
+  '(nil))
+
 
 ;;;; Profiling
 
--- /project/slime/cvsroot/slime/ChangeLog	2006/09/21 17:36:18	1.957
+++ /project/slime/cvsroot/slime/ChangeLog	2006/09/24 21:52:55	1.958
@@ -1,3 +1,18 @@
+2006-09-25  Juho Snellman  <jsnell at iki.fi>	
+
+	Fix Slime on SBCL 0.9.17.
+	
+	* swank-backend.lisp (ignored-xref-function-names): New interface
+
+	* swank.lisp (sanitize-xrefs): Use ignored-xref-function-names
+	instead of having a #+sbcl special case.
+	
+	* swank-sbcl.lisp (ignored-xref-function-names): Implement.
+	Filter out SB-C::STEP-VALUES, not just SB-C::STEP-FORM, as done by
+	the old sanitize-xrefs.	Don't implement the interface at all if
+	SBCL is sufficiently new (those symbols don't exist any more, and
+	there's nothing in their place to be ignored).
+
 2006-09-21  Marco Baringer  <mb at bese.it>
 
 	* swank.lisp (find-definitions-for-emacs): Don't return locations