only use tree-il evaluator for elisp

diff --git a/module/language/elisp/boot.el b/module/language/elisp/boot.el
index e6d3994..27af815 100644 (file)
--- a/module/language/elisp/boot.el
+++ b/module/language/elisp/boot.el
@@ -209,12 +209,7 @@
       f)))
 
 (defun eval (form)
-  (%funcall (@ (system base compile) compile)
-            form
-            (%funcall (@ (guile) symbol->keyword) 'from)
-            'elisp
-            (%funcall (@ (guile) symbol->keyword) 'to)
-            'value))
+  (%funcall (@ (language elisp runtime) eval-elisp) form))
 
 (defun %indirect-function (object)
   (cond

diff --git a/module/language/elisp/compile-tree-il.scm b/module/language/elisp/compile-tree-il.scm
index 9f2b10c..3e4f74b 100644 (file)
--- a/module/language/elisp/compile-tree-il.scm
+++ b/module/language/elisp/compile-tree-il.scm
@@ -30,6 +30,7 @@
   #:use-module (srfi srfi-11)
   #:use-module (srfi srfi-26)
   #:use-module (ice-9 format)
+  #:use-module (language tree-il eval)
   #:export (compile-tree-il
             compile-progn
             compile-eval-when-compile
@@ -462,7 +463,7 @@
                  (map compile-expr-1 args))))
 
 (defspecial eval-when-compile (loc args)
-  (make-const loc (compile `(progn ,@args) #:from 'elisp #:to 'value)))
+  (make-const loc (eval-elisp `(progn ,@args))))
 
 (define toplevel? (make-fluid))
 
@@ -786,7 +787,7 @@
                                           body))))
                   (make-const loc name))))
            (when (fluid-ref toplevel?)
-             (compile tree-il #:from 'tree-il #:to 'value))
+             (eval-tree-il tree-il))
            tree-il)))
     (else (report-error loc "bad defmacro" args))))
 

diff --git a/module/language/elisp/runtime.scm b/module/language/elisp/runtime.scm
index d6d4f70..0bd1c3a 100644 (file)
--- a/module/language/elisp/runtime.scm
+++ b/module/language/elisp/runtime.scm
@@ -22,6 +22,7 @@
   #:use-module (ice-9 format)
   #:use-module ((system base compile)
                 #:select (compile))
+  #:use-module (language tree-il eval)
   #:export (nil-value
             t-value
             value-slot-module
@@ -247,7 +248,7 @@
   (set! set-lexical-binding-mode (lambda (x) (set-symbol-value! 'lexical-binding x))))
 
 (define (eval-elisp form)
-  (compile form #:from 'elisp #:to 'value))
+  (eval-tree-il (compile form #:from 'elisp #:to 'tree-il)))
 
 (define (compile-elisp form)
   (compile (compile form #:from 'elisp #:to 'bytecode)

diff --git a/module/language/tree-il/eval.scm b/module/language/tree-il/eval.scm
index cdc1c99..1c29dd1 100644 (file)
--- a/module/language/tree-il/eval.scm
+++ b/module/language/tree-il/eval.scm
@@ -6,7 +6,7 @@
   #:use-module (srfi srfi-11)
   #:use-module (srfi srfi-1)
   #:use-module (ice-9 format)
-  #:export (compile-value))
+  #:export (eval-tree-il))
 
 (define guile-module (resolve-module '(guile)))
 
@@ -143,5 +143,5 @@
             (eval1 tag e)
             (append (map (cut eval1 <> e) args) (eval1 tail e))))))
 
-(define (compile-value x e opts)
-  (values (eval1 x '()) e e))
+(define (eval-tree-il x)
+  (eval1 x '()))

diff --git a/module/language/tree-il/spec.scm b/module/language/tree-il/spec.scm
index 6c72b26..a7d1696 100644 (file)
--- a/module/language/tree-il/spec.scm
+++ b/module/language/tree-il/spec.scm
@@ -23,7 +23,6 @@
   #:use-module (system base pmatch)
   #:use-module (language tree-il)
   #:use-module (language tree-il compile-cps)
-  #:use-module (language tree-il eval)
   #:export (tree-il))
 
 (define (write-tree-il exp . port)
@@ -43,7 +42,6 @@
   #:printer    write-tree-il
   #:parser      parse-tree-il
   #:joiner      join
-  #:compilers   `((value . ,compile-value)
-                  (cps . ,compile-cps))
+  #:compilers   `((cps . ,compile-cps))
   #:for-humans? #f
   )