From 7ecebbc06fdedf20bcad07e0740214feb197a4d1 Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Sun, 5 Sep 2010 02:32:57 +0200 Subject: Guile: xref commands working again --- geiser/xref.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/geiser/xref.scm b/geiser/xref.scm index 4f1b2cc..7dfa8af 100644 --- a/geiser/xref.scm +++ b/geiser/xref.scm @@ -48,20 +48,19 @@ (cond ((not (program? p)) #f) ((program-source p 0) => (lambda (s) (make-location (program-path p) (source:line s)))) - ((program-path p) => - (lambda (s) (make-location (program-path p) #f))) + ((program-path p) => (lambda (s) (make-location s #f))) (else #f))) (define (program-path p) (let* ((mod (program-module p)) - (name (and mod (module-name mod)))) + (name (and (module? mod) (module-name mod)))) (and name (module-path name)))) (define (procedure-xref proc . mod-name) - (let ((proc-name (or (procedure-name proc) ')) - (mod-name (if (null? mod-name) - (symbol-module proc-name) - (car mod-name)))) + (let* ((proc-name (or (procedure-name proc) ')) + (mod-name (if (null? mod-name) + (symbol-module proc-name) + (car mod-name)))) (make-xref proc proc-name mod-name))) (define (callers sym) -- cgit v1.2.3