Skip to content

Commit

Permalink
* swank-ecl.lisp: Forgot to update ECL's backend when introducing
Browse files Browse the repository at this point in the history
  swank-frames in commit on 2008-09-12.
  • Loading branch information
trittweiler committed Sep 18, 2008
1 parent f00f8dd commit 6443eec
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
@@ -1,3 +1,8 @@
2008-09-18 Tobias C. Rittweiler <tcr@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@common-lisp.net>

* slime.el (slime-eval-with-transcript): Accept some more arguments
Expand Down
20 changes: 11 additions & 9 deletions swank-ecl.lisp
Expand Up @@ -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)
Expand All @@ -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*))
Expand All @@ -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)))
Expand Down Expand Up @@ -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))))
Expand Down

0 comments on commit 6443eec

Please sign in to comment.