summaryrefslogtreecommitdiff
path: root/module/language/tree-il/fix-letrec.scm
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2009-12-11 12:00:27 +0100
committerAndy Wingo <wingo@pobox.com>2009-12-11 12:00:27 +0100
commitb6d93b118271409c6c1b3d163a3b3cf329c77b17 (patch)
treedc5bacc6e72951528397658e08e1e97a6898cd7a /module/language/tree-il/fix-letrec.scm
parent3a88cb3b17831a09cf7ff10953be13ab7eb0a663 (diff)
downloadguile-b6d93b118271409c6c1b3d163a3b3cf329c77b17.tar.gz
rename <conditional> then and else to consequent and alternate
* module/language/tree-il.scm (<tree-il>): Rename the "then" and "else" clauses of <conditional> to "consequent" and "alternate". More verbose, yes, but that way we avoid unexpected behavior with "else". (parse-tree-il, unparse-tree-il, tree-il->scheme, tree-il-fold): (make-tree-il-folder, post-order!, pre-order!) * module/language/tree-il/analyze.scm (analyze-lexicals): * module/language/tree-il/compile-glil.scm (flatten): * module/language/tree-il/fix-letrec.scm (simple-expression?): Update callers.
Diffstat (limited to 'module/language/tree-il/fix-letrec.scm')
-rw-r--r--module/language/tree-il/fix-letrec.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/module/language/tree-il/fix-letrec.scm b/module/language/tree-il/fix-letrec.scm
index 9b66d9ed5..bef31ce8c 100644
--- a/module/language/tree-il/fix-letrec.scm
+++ b/module/language/tree-il/fix-letrec.scm
@@ -37,10 +37,10 @@
((<const>) #t)
((<lexical-ref> gensym)
(not (memq gensym bound-vars)))
- ((<conditional> test then else)
+ ((<conditional> test consequent alternate)
(and (simple-expression? test bound-vars)
- (simple-expression? then bound-vars)
- (simple-expression? else bound-vars)))
+ (simple-expression? consequent bound-vars)
+ (simple-expression? alternate bound-vars)))
((<sequence> exps)
(and-map (lambda (x) (simple-expression? x bound-vars))
exps))