From f9d746bd4600d34d3b3fe72d5159b58d6160bfb9 Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Sat, 13 Jun 2009 03:50:23 +0200 Subject: Guile: rewriting stack trace captures - not yet complete. --- elisp/geiser-debug.el | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'elisp/geiser-debug.el') diff --git a/elisp/geiser-debug.el b/elisp/geiser-debug.el index bc155c9..7ebd0b5 100644 --- a/elisp/geiser-debug.el +++ b/elisp/geiser-debug.el @@ -72,14 +72,9 @@ (defsubst geiser-debug--frame-source-column (src) (or (caddr src) 0)) (defun geiser-debug--display-stack (stack) - (let* ((frames (cdr stack)) - (step 2) - (indent (* (length frames) step))) - (dolist (f frames) - (geiser-debug--display-stack-frame f indent) - (setq indent (- indent step))))) - -(defun geiser-debug--display-stack-frame (frame offset) + (mapc 'geiser-debug--display-stack-frame (reverse (cdr stack)))) + +(defun geiser-debug--display-stack-frame (frame) (let ((procedure (geiser-debug--frame-proc frame)) (source (geiser-debug--frame-source frame)) (description (geiser-debug--frame-desc frame))) @@ -89,7 +84,7 @@ (geiser-debug--frame-source-line source) (1+ (geiser-debug--frame-source-column source)))) (insert "In expression:\n")) - (insert (format "%s%s\n" (make-string offset ?\ ) description)))) + (insert (format "%s\n" description)))) (defsubst geiser-debug--wrap-region (str) (format "(begin %s)" str)) @@ -112,7 +107,8 @@ (defun geiser-debug--expand-region (start end all wrap) (let* ((str (buffer-substring-no-properties start end)) (wrapped (if wrap (geiser-debug--wrap-region str) str)) - (code `(:eval ((:ge macroexpand) (quote (:scm ,wrapped)) ,(if all :t :f)))) + (code `(:eval ((:ge macroexpand) (quote (:scm ,wrapped)) + ,(if all :t :f)))) (ret (geiser-eval--send/wait code)) (err (geiser-eval--retort-error ret)) (result (geiser-eval--retort-result ret))) -- cgit v1.2.3