cwebber pushed a commit to branch compile-to-js-merge
in repository guile.
commit 23f829b1750fc02bb9d354dacd9e9d2e4abf1462
Author: Ian Price <[email protected]>
AuthorDate: Wed Jun 14 21:13:56 2017 +0100
Fix build of (language cps compile-js)
* module/language/cps/compile-js.scm (compile-js): Use lower-cps
from (language cps compile-bytecode) rather than optimize, which is no
longer there.
---
module/language/cps/compile-js.scm | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/module/language/cps/compile-js.scm
b/module/language/cps/compile-js.scm
index 34b1ffe..ddfe88c 100644
--- a/module/language/cps/compile-js.scm
+++ b/module/language/cps/compile-js.scm
@@ -5,18 +5,10 @@
#:use-module (ice-9 match)
#:export (compile-js))
-(define optimize (@@ (language cps compile-bytecode) optimize))
-(define convert-closures (@@ (language cps compile-bytecode) convert-closures))
-(define reify-primitives (@@ (language cps compile-bytecode) reify-primitives))
-(define renumber (@@ (language cps compile-bytecode) renumber))
+(define lower-cps (@@ (language cps compile-bytecode) lower-cps))
(define (compile-js exp env opts)
- ;; See comment in `optimize' about the use of set!.
- (set! exp (optimize exp opts))
- (set! exp (convert-closures exp))
- ;; first-order optimization should go here
- (set! exp (reify-primitives exp))
- (set! exp (renumber exp))
+ (set! exp (lower-cps exp opts))
(match exp
(($ $program (($ $cont ks funs) ...))
;; TODO: I should special case the compilation for the initial fun,
