summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vikalpa.scm11
1 files changed, 9 insertions, 2 deletions
diff --git a/vikalpa.scm b/vikalpa.scm
index 0264ba9..27d09c8 100644
--- a/vikalpa.scm
+++ b/vikalpa.scm
@@ -168,8 +168,15 @@
(define (expression-vars expr)
(cond
- ((pair? expr)
- (apply lset-union eq?
+ ((expr-quoted? expr) '())
+ ((if-form? expr)
+ (lset-union eq?
+ (expression-vars (if-form-test expr))
+ (expression-vars (if-form-then expr))
+ (expression-vars (if-form-else expr))))
+ ((app-form? expr)
+ (apply lset-union
+ eq?
(map expression-vars (app-form-args expr))))
((variable? expr) (list expr))
(else '())))