[Guile-commits] 92/99: Merge branch 'compile-to-js-2017' into compile-to-js-rebase

[Christopher Allan Webber]

cwebber pushed a commit to branch compile-to-js-merge
in repository guile.

commit 88f7aa0b3aa48f10a04715c5bc24e2039eae9c6c
Merge: 53e5cf6 05c57a6
Author: Christopher Lemmer Webber <cwebber@dustycloud.org>
AuthorDate: Mon May 10 15:58:15 2021 -0400

    Merge branch 'compile-to-js-2017' into compile-to-js-rebase

 module/Makefile.am                           |   48 +
 module/language/cps/compile-js.scm           |  201 ++++
 module/language/cps/spec.scm                 |    6 +-
 module/language/javascript.scm               |  274 +++++
 module/language/javascript/simplify.scm      |   58 +
 module/language/javascript/spec.scm          |   33 +
 module/language/js-il.scm                    |  138 +++
 module/language/js-il/compile-javascript.scm |  430 ++++++++
 module/language/js-il/inlining.scm           |  230 ++++
 module/language/js-il/runtime.js             | 1519 ++++++++++++++++++++++++++
 module/language/js-il/spec.scm               |   31 +
 module/scripts/jslink.scm                    |  215 ++++
 12 files changed, 3181 insertions(+), 2 deletions(-)

diff --cc module/Makefile.am
index 41b7709,4d4701f..0ad6a8f
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@@ -27,8 -28,9 +27,9 @@@ modpath 
  VM_TARGETS := system/vm/assembler.go system/vm/disassembler.go
  $(VM_TARGETS): $(top_builddir)/libguile/vm-operations.h
  
 -ice-9/boot-9.go: ice-9/boot-9.scm ice-9/quasisyntax.scm 
ice-9/r6rs-libraries.scm
 +ice-9/boot-9.go: ice-9/boot-9.scm ice-9/quasisyntax.scm 
ice-9/r6rs-libraries.scm ice-9/r7rs-libraries.scm ice-9/read.scm
  ice-9/match.go: ice-9/match.scm ice-9/match.upstream.scm
+ 
  srfi/srfi-64.go: srfi/srfi-64.scm srfi/srfi-64/testing.scm
  $(nobase_ccache_DATA): ../bootstrap/ice-9/eval.go
  
diff --cc module/language/cps/spec.scm
index 5864203,d897637..add9bb1
--- a/module/language/cps/spec.scm
+++ b/module/language/cps/spec.scm
@@@ -23,8 -23,8 +23,9 @@@
    #:use-module (system base language)
    #:use-module (language cps)
    #:use-module (language cps intmap)
 +  #:use-module (language cps optimize)
    #:use-module (language cps compile-bytecode)
+   #:use-module (language cps compile-js)
    #:export (cps))
  
  (define (read-cps port env)
@@@ -47,6 -47,7 +48,7 @@@
    #:title     "CPS Intermediate Language"
    #:reader    read-cps
    #:printer   write-cps
-   #:compilers   `((bytecode . ,compile-bytecode))
+   #:compilers   `((bytecode . ,compile-bytecode)
+                   (js-il . ,compile-js))
    #:for-humans? #f
 -  )
 +  #:lowerer     make-cps-lowerer)