summaryrefslogtreecommitdiff
path: root/elisp
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2010-03-07 21:29:13 +0100
committerJose Antonio Ortega Ruiz <jao@gnu.org>2010-03-07 21:29:13 +0100
commit2f80b75ded14c09081c42006461c6a02ef426463 (patch)
tree6582cbda2f9a5b122fc05b9712e725a3cb9b8185 /elisp
parent8d9c680112cfd8dd0b90eb347a058467f0586ceb (diff)
downloadgeiser-2f80b75ded14c09081c42006461c6a02ef426463.tar.gz
geiser-2f80b75ded14c09081c42006461c6a02ef426463.tar.bz2
Implementations can now specify additional binding forms.
Diffstat (limited to 'elisp')
-rw-r--r--elisp/geiser-completion.el20
-rw-r--r--elisp/geiser-syntax.el26
2 files changed, 36 insertions, 10 deletions
diff --git a/elisp/geiser-completion.el b/elisp/geiser-completion.el
index 9efe89f..09c021f 100644
--- a/elisp/geiser-completion.el
+++ b/elisp/geiser-completion.el
@@ -134,11 +134,25 @@ terminates a current completion."
;;; Completion functionality:
+(defvar geiser-completion--binding-forms nil)
+(geiser-impl--register-local-variable
+ 'geiser-completion--binding-forms 'binding-forms nil
+ "A list of forms introducing local bindings, a la let or lambda.")
+
+(defvar geiser-completion--binding-forms* nil)
+(geiser-impl--register-local-variable
+ 'geiser-completion--binding-forms* 'binding-forms* nil
+ "A list of forms introducing nested local bindings, a la let*.")
+
+(defsubst geiser-completion--locals ()
+ (mapcar 'symbol-name
+ (geiser-syntax--locals-around-point
+ geiser-completion--binding-forms
+ geiser-completion--binding-forms*)))
+
(defun geiser-completion--symbol-list (prefix)
(delete-duplicates
- (append (all-completions prefix
- (mapcar 'symbol-name
- (geiser-syntax--locals-around-point)))
+ (append (all-completions prefix (geiser-completion--locals))
(geiser-eval--send/result `(:eval ((:ge completions) ,prefix))))
:test 'string=))
diff --git a/elisp/geiser-syntax.el b/elisp/geiser-syntax.el
index e61ab54..7bd3cb1 100644
--- a/elisp/geiser-syntax.el
+++ b/elisp/geiser-syntax.el
@@ -221,29 +221,41 @@
(let ((fst (symbol-at-point)))
(and fst `((,fst 0)))))))
-(defun geiser-syntax--scan-locals (form partial locals)
+(defsubst geiser-syntax--binding-form-p (bfs sbfs f)
+ (or (memq f '(define define* lambda let let* letrec))
+ (memq f bfs)
+ (memq f sbfs)))
+
+(defsubst geiser-syntax--binding-form*-p (sbfs f)
+ (or (eq 'let* f) (memq f sbfs)))
+
+(defun geiser-syntax--scan-locals (bfs sbfs form partial locals)
(flet ((if-symbol (x) (and (symbolp x) x))
(if-list (x) (and (listp x) x))
(normalize (vars) (mapcar (lambda (i) (if (listp i) (car i) i)) vars)))
(cond ((or (null form) (not (listp form))) (normalize locals))
- ((not (memq (car form) '(define let let* letrec lambda)))
- (geiser-syntax--scan-locals (car (last form)) partial locals))
+ ((not (geiser-syntax--binding-form-p bfs sbfs (car form)))
+ (geiser-syntax--scan-locals bfs sbfs
+ (car (last form)) partial locals))
(t
(let* ((head (car form))
(name (if-symbol (cadr form)))
(names (if name (if-list (caddr form))
(if-list (cadr form))))
(rest (if name (cdddr form) (cddr form)))
- (use-names (or (eq head 'let*) (not partial) rest)))
+ (use-names (or rest
+ (not partial)
+ (geiser-syntax--binding-form*-p sbfs head))))
(when name (push name locals))
(when use-names (dolist (n names) (push n locals)))
(dolist (f (butlast rest))
(when (eq (car f) 'define) (push (cadr f) locals)))
- (geiser-syntax--scan-locals (car (last (or rest names)))
+ (geiser-syntax--scan-locals bfs sbfs
+ (car (last (or rest names)))
partial
locals))))))
-(defun geiser-syntax--locals-around-point ()
+(defun geiser-syntax--locals-around-point (bfs sbfs)
(when (eq major-mode 'scheme-mode)
(save-excursion
(geiser-syntax--skip-comment/string)
@@ -252,7 +264,7 @@
(backward-up-list))
(multiple-value-bind (form end)
(geiser-syntax--form-after-point boundary)
- (geiser-syntax--scan-locals form (> end boundary) '()))))))
+ (geiser-syntax--scan-locals bfs sbfs form (> end boundary) '()))))))
;;; Fontify strings as Scheme code: