[slime-cvs] CVS slime

[trittweiler]

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

Modified Files:
	swank-ecl.lisp ChangeLog 
Log Message:

* swank-ecl.lisp: Forgot to update ECL's backend when introducing
  swank-frames in commit on 2008-09-12.


--- /project/slime/cvsroot/slime/swank-ecl.lisp	2008/09/17 06:19:48	1.30
+++ /project/slime/cvsroot/slime/swank-ecl.lisp	2008/09/18 10:08:34	1.31
@@ -272,11 +272,11 @@
   (declare (type function debugger-loop-fn))
   (let* ((*tpl-commands* si::tpl-commands)
          (*ihs-top* (ihs-top 'call-with-debugging-environment))
-	 (*ihs-current* *ihs-top*)
-	 (*frs-base* (or (sch-frs-base *frs-top* *ihs-base*) (1+ (frs-top))))
-	 (*frs-top* (frs-top))
-	 (*read-suppress* nil)
-	 (*tpl-level* (1+ *tpl-level*))
+         (*ihs-current* *ihs-top*)
+         (*frs-base* (or (sch-frs-base *frs-top* *ihs-base*) (1+ (frs-top))))
+         (*frs-top* (frs-top))
+         (*read-suppress* nil)
+         (*tpl-level* (1+ *tpl-level*))
          (*backtrace* (loop for ihs from *ihs-base* below *ihs-top*
                             collect (list (si::ihs-fun ihs)
                                           (si::ihs-env ihs)
@@ -289,7 +289,7 @@
                    (unless (si::fixnump name)
                      (push name (third x)))))))
     (setf *backtrace* (remove-if #'is-ignorable-fun-p (nreverse *backtrace*)))
-    (Setf *tmp* *backtrace*)
+    (setf *tmp* *backtrace*)
     (set-break-env)
     (set-current-ihs)
     (let ((*ihs-base* *ihs-top*))
@@ -303,7 +303,8 @@
 (defimplementation compute-backtrace (start end)
   (when (numberp end)
     (setf end (min end (length *backtrace*))))
-  (subseq *backtrace* start end))
+  (loop for f in (subseq *backtrace* start end)
+        collect (make-swank-frame :%frame f :restartable :unknown)))
 
 (defun frame-name (frame)
   (let ((x (first frame)))
@@ -343,8 +344,9 @@
 	       ))))
     (values functions blocks variables)))
 
-(defimplementation print-frame (frame stream)
-  (format stream "~A" (first frame)))
+(defimplementation print-swank-frame (swank-frame stream)
+  (let ((frame (swank-frame.%frame swank-frame)))
+    (format stream "~A" (first frame))))
 
 (defimplementation frame-source-location-for-emacs (frame-number)
   (nth-value 1 (frame-function (elt *backtrace* frame-number))))
--- /project/slime/cvsroot/slime/ChangeLog	2008/09/17 23:14:45	1.1517
+++ /project/slime/cvsroot/slime/ChangeLog	2008/09/18 10:08:37	1.1518
@@ -1,3 +1,8 @@
+2008-09-18  Tobias C. Rittweiler  <tcr at freebits.de>
+
+	* swank-ecl.lisp: Forgot to update ECL's backend when introducing
+	swank-frames in commit on 2008-09-12.
+
 2008-09-18  Helmut Eller  <heller at common-lisp.net>
 
 	* slime.el (slime-eval-with-transcript): Accept some more arguments