[slime-cvs] CVS slime/contrib

[CVS User heller]

Update of /project/slime/cvsroot/slime/contrib
In directory cl-net:/tmp/cvs-serv4684/contrib

Modified Files:
	ChangeLog swank-goo.goo swank-kawa.scm swank-mit-scheme.scm 
Log Message:
* swank-mit-scheme.scm (swank:frame-locals-and-catch-tags)
* swank-kawa.scm (dispatch-events)
* swank-goo.goo (frame-locals-and-catch-tags): Update
backends for the new swank:frame-locals-and-catch-tags.

--- /project/slime/cvsroot/slime/contrib/ChangeLog	2008/10/16 21:15:39	1.133
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2008/10/19 20:03:55	1.134
@@ -1,3 +1,10 @@
+2008-10-19  Helmut Eller  <heller at common-lisp.net>
+
+	* swank-mit-scheme.scm (swank:frame-locals-and-catch-tags)
+	* swank-kawa.scm (dispatch-events)
+	* swank-goo.goo (frame-locals-and-catch-tags): Update
+	backends for the new swank:frame-locals-and-catch-tags.
+
 2008-10-16  Helmut Eller  <heller at common-lisp.net>
 
 	* swank-kawa.scm (swank-require): Add a dummy definition to avoid
--- /project/slime/cvsroot/slime/contrib/swank-goo.goo	2008/01/19 14:08:27	1.1
+++ /project/slime/cvsroot/slime/contrib/swank-goo.goo	2008/10/19 20:03:55	1.2
@@ -228,14 +228,14 @@
                                     start
                                     (if (isa? end <int>) end #f))))
 
-(defslimefun frame-locals-for-emacs (frame-idx)
+(defslimefun frame-locals-and-catch-tags (frame-idx)
   (def frame (nth-frame frame-idx))
-  (map-keyed (fun (i name) 
-               (lst ':name (sym-name name) ':id 0 
-                    ':value (safe-write-to-string (frame-var-value frame i))))
-             (frame-var-names frame)))
-
-(defslimefun frame-catch-tags-for-emacs (frame-idx) '())
+  (list
+   (map-keyed (fun (i name) 
+                (lst ':name (sym-name name) ':id 0 
+                     ':value (safe-write-to-string (frame-var-value frame i))))
+              (frame-var-names frame))
+   '()))
 
 (defslimefun inspect-frame-var (frame-idx var-idx)
   (reset-inspector)
--- /project/slime/cvsroot/slime/contrib/swank-kawa.scm	2008/10/16 21:15:39	1.9
+++ /project/slime/cvsroot/slime/contrib/swank-kawa.scm	2008/10/19 20:03:55	1.10
@@ -375,12 +375,9 @@
           ((_ (':emacs-rex ('|swank:frame-source-location-for-emacs| frame)
                            pkg thread id))
            (send dbg `(frame-src-loc ,thread ,frame ,id)))
-          ((_ (':emacs-rex ('|swank:frame-locals-for-emacs| frame)
+          ((_ (':emacs-rex ('|swank:frame-locals-and-catch-tags| frame)
                            pkg thread id))
-           (send dbg `(frame-locals ,thread ,frame ,id)))
-          ((_ (':emacs-rex ('|swank:frame-catch-tags-for-emacs| frame)
-                           pkg thread id))
-           (send dbg `(frame-catchers ,thread ,frame ,id)))
+           (send dbg `(frame-details ,thread ,frame ,id)))
           ((_ (':emacs-rex ('|swank:sldb-disassemble| frame)
                            pkg thread id))
            (send dbg `(disassemble-frame ,thread ,frame ,id)))
@@ -1179,10 +1176,8 @@
            (set state (thread-continue thread id c state)))
           ((,c . ('frame-src-loc thread frame id))
            (reply c (frame-src-loc thread frame state) id))
-          ((,c . ('frame-locals thread frame id))
-           (reply c (frame-locals thread frame state) id))
-          ((,c . ('frame-catchers thread frame id))
-           (reply c (frame-catchers thread frame state) id))
+          ((,c . ('frame-details thread frame id))
+           (reply c (list (frame-locals thread frame state) '()) id))
           ((,c . ('disassemble-frame thread frame id))
            (reply c (disassemble-frame thread frame state) id))
           ((,c . ('thread-frames thread from to id))
@@ -1454,9 +1449,6 @@
                    (pack (list (! name var) val)))))))
       (<java.lang.StackTraceElement> '()))))
 
-(df frame-catchers ((tid <int>) (frame <int>) state)
-  '())
-
 (df disassemble-frame ((tid <int>) (frame <int>) state)
   (mlet ((frame _) (nth-frame tid frame state))
     (typecase frame
--- /project/slime/cvsroot/slime/contrib/swank-mit-scheme.scm	2008/03/18 13:22:05	1.3
+++ /project/slime/cvsroot/slime/contrib/swank-mit-scheme.scm	2008/10/19 20:03:55	1.4
@@ -395,7 +395,6 @@
 
 ;;; Some unimplemented stuff.
 (define (swank:buffer-first-change . _) nil)
-(define (swank:frame-catch-tags-for-emacs . _) nil)
 (define (swank:filename-to-modulename . _) nil)
 
 ;; M-. is beyond my capabilities.
@@ -525,8 +524,9 @@
 	  ((< i from) (loop (1+ i) l (stream-cdr s)))
 	  (else (loop (1+ i) (cons (stream-car s) l) (stream-cdr s))))))
 
-(define (swank:frame-locals-for-emacs _ frame)
-  (map frame-var>elisp (frame-vars (sldb-get-frame frame))))
+(define (swank:frame-locals-and-catch-tags _ frame)
+  (list (map frame-var>elisp (frame-vars (sldb-get-frame frame)))
+	'()))
   
 (define (frame-vars frame)
   (with-values (lambda () (stack-frame/debugging-info frame))