summaryrefslogtreecommitdiff
path: root/module/language/tree-il.scm
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2010-05-02 11:22:23 +0200
committerAndy Wingo <wingo@pobox.com>2010-05-02 11:22:23 +0200
commit93f63467e6e9d2f0203fd1c54a98539f5fefeba0 (patch)
tree759c50cfebaf6a64f48167e2ad7bd7f11e730c44 /module/language/tree-il.scm
parent915aca30baccaf646752d84f11d4e461ca24391a (diff)
downloadguile-93f63467e6e9d2f0203fd1c54a98539f5fefeba0.tar.gz
rename `vars' field in tree-il binding constructs to `gensyms'
* module/language/tree-il.scm (<tree-il>): Rename `vars' fields of <let>, <letrec>, <fix>, and <lambda-case> to `gensyms'. For clarity, and to match <lexical-ref>. * module/language/tree-il.scm: * module/language/tree-il/analyze.scm: * module/language/tree-il/compile-glil.scm: * module/language/tree-il/fix-letrec.scm: * module/language/tree-il/inline.scm: Update all callers.
Diffstat (limited to 'module/language/tree-il.scm')
-rw-r--r--module/language/tree-il.scm74
1 files changed, 37 insertions, 37 deletions
diff --git a/module/language/tree-il.scm b/module/language/tree-il.scm
index 8daf49a19..bec3bec92 100644
--- a/module/language/tree-il.scm
+++ b/module/language/tree-il.scm
@@ -39,11 +39,11 @@
<lambda> lambda? make-lambda lambda-src lambda-meta lambda-body
<lambda-case> lambda-case? make-lambda-case lambda-case-src
lambda-case-req lambda-case-opt lambda-case-rest lambda-case-kw
- lambda-case-inits lambda-case-vars
+ lambda-case-inits lambda-case-gensyms
lambda-case-body lambda-case-alternate
- <let> let? make-let let-src let-names let-vars let-vals let-body
- <letrec> letrec? make-letrec letrec-src letrec-names letrec-vars letrec-vals letrec-body
- <fix> fix? make-fix fix-src fix-names fix-vars fix-vals fix-body
+ <let> let? make-let let-src let-names let-gensyms let-vals let-body
+ <letrec> letrec? make-letrec letrec-src letrec-names letrec-gensyms letrec-vals letrec-body
+ <fix> fix? make-fix fix-src fix-names fix-gensyms fix-vals fix-body
<let-values> let-values? make-let-values let-values-src let-values-exp let-values-body
<dynwind> dynwind? make-dynwind dynwind-src dynwind-winder dynwind-body dynwind-unwinder
<dynlet> dynlet? make-dynlet dynlet-src dynlet-fluids dynlet-vals dynlet-body
@@ -76,10 +76,10 @@
(<application> proc args)
(<sequence> exps)
(<lambda> meta body)
- (<lambda-case> req opt rest kw inits vars body alternate)
- (<let> names vars vals body)
- (<letrec> names vars vals body)
- (<fix> names vars vals body)
+ (<lambda-case> req opt rest kw inits gensyms body alternate)
+ (<let> names gensyms vals body)
+ (<letrec> names gensyms vals body)
+ (<fix> names gensyms vals body)
(<let-values> exp body)
(<dynwind> winder body unwinder)
(<dynlet> fluids vals body)
@@ -147,15 +147,15 @@
((lambda ,meta ,body)
(make-lambda loc meta (retrans body)))
- ((lambda-case ((,req ,opt ,rest ,kw ,inits ,vars) ,body) ,alternate)
+ ((lambda-case ((,req ,opt ,rest ,kw ,inits ,gensyms) ,body) ,alternate)
(make-lambda-case loc req opt rest kw
- (map retrans inits) vars
+ (map retrans inits) gensyms
(retrans body)
(and=> alternate retrans)))
- ((lambda-case ((,req ,opt ,rest ,kw ,inits ,vars) ,body))
+ ((lambda-case ((,req ,opt ,rest ,kw ,inits ,gensyms) ,body))
(make-lambda-case loc req opt rest kw
- (map retrans inits) vars
+ (map retrans inits) gensyms
(retrans body)
#f))
@@ -165,14 +165,14 @@
((begin . ,exps)
(make-sequence loc (map retrans exps)))
- ((let ,names ,vars ,vals ,body)
- (make-let loc names vars (map retrans vals) (retrans body)))
+ ((let ,names ,gensyms ,vals ,body)
+ (make-let loc names gensyms (map retrans vals) (retrans body)))
- ((letrec ,names ,vars ,vals ,body)
- (make-letrec loc names vars (map retrans vals) (retrans body)))
+ ((letrec ,names ,gensyms ,vals ,body)
+ (make-letrec loc names gensyms (map retrans vals) (retrans body)))
- ((fix ,names ,vars ,vals ,body)
- (make-fix loc names vars (map retrans vals) (retrans body)))
+ ((fix ,names ,gensyms ,vals ,body)
+ (make-fix loc names gensyms (map retrans vals) (retrans body)))
((let-values ,exp ,body)
(make-let-values loc (retrans exp) (retrans body)))
@@ -236,8 +236,8 @@
((<lambda> meta body)
`(lambda ,meta ,(unparse-tree-il body)))
- ((<lambda-case> req opt rest kw inits vars body alternate)
- `(lambda-case ((,req ,opt ,rest ,kw ,(map unparse-tree-il inits) ,vars)
+ ((<lambda-case> req opt rest kw inits gensyms body alternate)
+ `(lambda-case ((,req ,opt ,rest ,kw ,(map unparse-tree-il inits) ,gensyms)
,(unparse-tree-il body))
. ,(if alternate (list (unparse-tree-il alternate)) '())))
@@ -247,14 +247,14 @@
((<sequence> exps)
`(begin ,@(map unparse-tree-il exps)))
- ((<let> names vars vals body)
- `(let ,names ,vars ,(map unparse-tree-il vals) ,(unparse-tree-il body)))
+ ((<let> names gensyms vals body)
+ `(let ,names ,gensyms ,(map unparse-tree-il vals) ,(unparse-tree-il body)))
- ((<letrec> names vars vals body)
- `(letrec ,names ,vars ,(map unparse-tree-il vals) ,(unparse-tree-il body)))
+ ((<letrec> names gensyms vals body)
+ `(letrec ,names ,gensyms ,(map unparse-tree-il vals) ,(unparse-tree-il body)))
- ((<fix> names vars vals body)
- `(fix ,names ,vars ,(map unparse-tree-il vals) ,(unparse-tree-il body)))
+ ((<fix> names gensyms vals body)
+ `(fix ,names ,gensyms ,(map unparse-tree-il vals) ,(unparse-tree-il body)))
((<let-values> exp body)
`(let-values ,(unparse-tree-il exp) ,(unparse-tree-il body)))
@@ -324,9 +324,9 @@
`(lambda ,@(car (tree-il->scheme body)))
`(case-lambda ,@(tree-il->scheme body))))
- ((<lambda-case> req opt rest kw inits vars body alternate)
+ ((<lambda-case> req opt rest kw inits gensyms body alternate)
;; FIXME! use parse-lambda-case?
- `((,(if rest (apply cons* vars) vars)
+ `((,(if rest (apply cons* gensyms) gensyms)
,(tree-il->scheme body))
,@(if alternate (tree-il->scheme alternate) '())))
@@ -338,15 +338,15 @@
((<sequence> exps)
`(begin ,@(map tree-il->scheme exps)))
- ((<let> vars vals body)
- `(let ,(map list vars (map tree-il->scheme vals)) ,(tree-il->scheme body)))
+ ((<let> gensyms vals body)
+ `(let ,(map list gensyms (map tree-il->scheme vals)) ,(tree-il->scheme body)))
- ((<letrec> vars vals body)
- `(letrec ,(map list vars (map tree-il->scheme vals)) ,(tree-il->scheme body)))
+ ((<letrec> gensyms vals body)
+ `(letrec ,(map list gensyms (map tree-il->scheme vals)) ,(tree-il->scheme body)))
- ((<fix> vars vals body)
+ ((<fix> gensyms vals body)
;; not a typo, we really do translate back to letrec
- `(letrec ,(map list vars (map tree-il->scheme vals)) ,(tree-il->scheme body)))
+ `(letrec ,(map list gensyms (map tree-il->scheme vals)) ,(tree-il->scheme body)))
((<let-values> exp body)
`(call-with-values (lambda () ,(tree-il->scheme exp))
@@ -564,15 +564,15 @@ This is an implementation of `foldts' as described by Andy Wingo in
((<sequence> exps)
(set! (sequence-exps x) (map lp exps)))
- ((<let> vars vals body)
+ ((<let> gensyms vals body)
(set! (let-vals x) (map lp vals))
(set! (let-body x) (lp body)))
- ((<letrec> vars vals body)
+ ((<letrec> gensyms vals body)
(set! (letrec-vals x) (map lp vals))
(set! (letrec-body x) (lp body)))
- ((<fix> vars vals body)
+ ((<fix> gensyms vals body)
(set! (fix-vals x) (map lp vals))
(set! (fix-body x) (lp body)))