diff options
| author | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2010-10-31 15:53:12 +0100 |
|---|---|---|
| committer | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2010-10-31 15:53:12 +0100 |
| commit | ffd0a91a136909c4ed481184073e868ae886e230 (patch) | |
| tree | 23dcbe372eaeee9c3029315254e41882a8026d42 /scheme/guile | |
| parent | 449a5c9a05feed4f743d98172f78b250c6258d7a (diff) | |
| parent | 9325189d4b3cfa2207c015b4f60cf397089edc9f (diff) | |
| download | geiser-chez-ffd0a91a136909c4ed481184073e868ae886e230.tar.gz geiser-chez-ffd0a91a136909c4ed481184073e868ae886e230.tar.bz2 | |
Merge branch 'master' into guile-meta
Diffstat (limited to 'scheme/guile')
| -rw-r--r-- | scheme/guile/geiser/doc.scm | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/scheme/guile/geiser/doc.scm b/scheme/guile/geiser/doc.scm index f5471b5..902f2a3 100644 --- a/scheme/guile/geiser/doc.scm +++ b/scheme/guile/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))) |