From 4f8b5d17ba2436ca08e6ba442ef8dd5a8fa5a714 Mon Sep 17 00:00:00 2001 From: jao Date: Sun, 23 Oct 2022 06:26:29 +0100 Subject: all relevant condition locations, not just the last one --- src/geiser/geiser.ss | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/geiser') diff --git a/src/geiser/geiser.ss b/src/geiser/geiser.ss index f040413..0644b4d 100644 --- a/src/geiser/geiser.ss +++ b/src/geiser/geiser.ss @@ -39,7 +39,7 @@ (define (code-location obj) (let* ((i (inspect/object obj)) - (c (and i (i 'code)))) + (c (and i (not (eq? 'simple (i 'type))) (i 'code)))) (if c (let ((name `("name" . ,(or (c 'name) (write-to-string obj))))) (call-with-values (lambda () (c 'source-path)) @@ -53,8 +53,11 @@ (define (condition-location c) (let ((finder (make-object-finder procedure? c (collect-maximum-generation)))) - (let loop ((obj (finder))) - (if obj (or (code-location (car obj)) (loop (finder))) '())))) + (let loop ((obj (finder)) (res '())) + (if obj + (let ((loc (code-location (car obj)))) + (loop (finder) (if loc (cons loc res) res))) + res)))) (define (call-with-result thunk) (let ((output-string (open-output-string))) -- cgit v1.2.3