summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2010-10-31 15:53:12 +0100
committerJose Antonio Ortega Ruiz <jao@gnu.org>2010-10-31 15:53:12 +0100
commit0d93543a2ee7ce9ee48c3bf77dd68802c155dca1 (patch)
tree7d738ce6e12917bced44ccf67af6899d5efdfb4e
parent17ebbec2d56dee484d4ccc2ed893696c5e9accd6 (diff)
parent04fd67faa12cb2212dbd6004889fa59aa52a650d (diff)
downloadgeiser-guile-0d93543a2ee7ce9ee48c3bf77dd68802c155dca1.tar.gz
geiser-guile-0d93543a2ee7ce9ee48c3bf77dd68802c155dca1.tar.bz2
Merge branch 'master' into guile-meta
-rw-r--r--geiser/doc.scm13
1 files changed, 7 insertions, 6 deletions
diff --git a/geiser/doc.scm b/geiser/doc.scm
index f5471b5..902f2a3 100644
--- a/geiser/doc.scm
+++ b/geiser/doc.scm
@@ -66,16 +66,17 @@
(else 'variable)))
(define (arguments proc)
- (define (p-arguments prog)
- (map (lambda (a) ((@@ (system vm program) arity->arguments-alist) prog a))
- (or (program-arities prog) '())))
+ (define (p-args prog)
+ (let ((as (map (lambda (a)
+ ((@@ (system vm program) arity->arguments-alist) prog a))
+ (or (program-arities prog) '()))))
+ (and (not (null? as)) as)))
(define (clist f) (lambda (x) (let ((y (f x))) (and y (list y)))))
(cond ((is-a? proc <generic>) (generic-args proc))
+ ((doc->args proc) => list)
((procedure-property proc 'arglist) => (clist arglist->args))
((procedure-source proc) => (clist source->args))
- ((doc->args proc) => list)
- ((program? proc) (let ((a (p-arguments proc)))
- (and (not (null? a)) a)))
+ ((and (program? proc) (p-args proc)))
((procedure-property proc 'arity) => (clist arity->args))
(else #f)))