summaryrefslogtreecommitdiff
path: root/scheme/guile/geiser
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2009-02-28 17:16:20 +0100
committerJose Antonio Ortega Ruiz <jao@gnu.org>2009-02-28 17:16:20 +0100
commit034b3070c61888a0e88edd33506c58fdae9b2115 (patch)
treed44f44462d4bde5ef322398972bf48e4dc0d05c4 /scheme/guile/geiser
parent77253da86ac2d005a0802426c7ebe08bf8dca9ce (diff)
downloadgeiser-chez-034b3070c61888a0e88edd33506c58fdae9b2115.tar.gz
geiser-chez-034b3070c61888a0e88edd33506c58fdae9b2115.tar.bz2
Refactoring: local bindings discovery moved to schemeland.
Diffstat (limited to 'scheme/guile/geiser')
-rw-r--r--scheme/guile/geiser/introspection.scm31
1 files changed, 27 insertions, 4 deletions
diff --git a/scheme/guile/geiser/introspection.scm b/scheme/guile/geiser/introspection.scm
index 7e468e7..fd6784d 100644
--- a/scheme/guile/geiser/introspection.scm
+++ b/scheme/guile/geiser/introspection.scm
@@ -149,10 +149,33 @@ The alist keys that are currently defined are `required', `optional',
,@(if rest (list (cons 'rest 'rest)) '())))))
(else #f)))
-(define (completions prefix)
- (sort! (map symbol->string
- (apropos-internal (string-append "^" prefix)))
- string<?))
+(define (completions prefix . context)
+ (let ((context (and (not (null? context)) (car context)))
+ (prefix (string-append "^" (regexp-quote prefix))))
+ (append (filter (lambda (s) (string-match prefix s))
+ (map symbol->string (local-bindings context)))
+ (sort! (map symbol->string (apropos-internal prefix)) string<?))))
+
+(define (local-bindings form)
+ (define (body f) (if (> (length f) 2) (cddr f) '()))
+ (define (decl-list d)
+ (let loop ((d d) (s '()))
+ (cond ((null? d) s)
+ ((symbol? d) (cons d s))
+ (else (loop (cdr d) (cons (car d) s))))))
+ (let loop ((form form) (bindings '()))
+ (cond ((not (pair? form)) bindings)
+ ((list? (car form))
+ (loop (cdr form) (append (local-bindings (car form)) bindings)))
+ ((and (list? form) (< (length form) 2)) bindings)
+ ((memq (car form) '(define define* lambda))
+ (loop (body form) (append (decl-list (cadr form)) bindings)))
+ ((and (memq (car form) '(let let* letrec letrec*))
+ (list? (cadr form)))
+ (loop (body form) (append (map car (cadr form)) bindings)))
+ ((and (eq? 'let (car form)) (symbol? (cadr form)))
+ (loop (cons 'let (body form)) (cons (cadr form) bindings)))
+ (else (loop (cdr form) bindings)))))
(define (module-location name)
(make-location (module-filename name) #f))