summaryrefslogtreecommitdiff
path: root/scheme/guile/geiser/completion.scm
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2009-08-18 06:16:57 +0200
committerJose Antonio Ortega Ruiz <jao@gnu.org>2009-08-18 06:16:57 +0200
commit5a7373cd2da209e8a58b35060c0b29bd18398957 (patch)
tree93f54fbdd0c63dae576e8f71fc40c1453c9c2f59 /scheme/guile/geiser/completion.scm
parent203c989e07b43afb34f2c795cbda8126e9c0d327 (diff)
downloadgeiser-chez-5a7373cd2da209e8a58b35060c0b29bd18398957.tar.gz
geiser-chez-5a7373cd2da209e8a58b35060c0b29bd18398957.tar.bz2
Yet another deklugdification: locals scanning moved to elisp.
... and say goodbye to the ugly parse partial sexp, reducing not only sloppy code, but also duplication and data transfers.
Diffstat (limited to 'scheme/guile/geiser/completion.scm')
-rw-r--r--scheme/guile/geiser/completion.scm25
1 files changed, 3 insertions, 22 deletions
diff --git a/scheme/guile/geiser/completion.scm b/scheme/guile/geiser/completion.scm
index f4342bb..564b8f5 100644
--- a/scheme/guile/geiser/completion.scm
+++ b/scheme/guile/geiser/completion.scm
@@ -31,28 +31,9 @@
#:use-module (ice-9 session)
#:use-module (ice-9 regex))
-(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) '()))
- (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 (pair->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 (completions prefix)
+ (let ((prefix (string-append "^" (regexp-quote prefix))))
+ (sort! (map symbol->string (apropos-internal prefix)) string<?)))
(define (module-completions prefix)
(let* ((prefix (string-append "^" (regexp-quote prefix)))