Eliminate compiler->keyword.

diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index 8ba7bb7a59df702d261a4a568bce66ac480242b3..d05fd214bc36338db42a981e9862779ee66a4d28 100644 (file)
--- a/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@ -4427,7 +4427,6 @@ USA.
          classify-forms
          compile-body-items
          compile-expr-item
-         compiler->keyword
          define-item-compiler
          hist-caddr
          hist-cadr

diff --git a/src/runtime/syntax-rules.scm b/src/runtime/syntax-rules.scm
index fbbe9141347ecb14825d14fcfc88b41e260c8cf7..6f94dc05166f6c8c387db6f2f2a7e46f77de8e86 100644 (file)
--- a/src/runtime/syntax-rules.scm
+++ b/src/runtime/syntax-rules.scm
@@ -250,11 +250,11 @@ USA.
   #f)
 
 (define (syntax-quote expression)
-  `(,(compiler->keyword
+  `(,(classifier->keyword
       (lambda (form senv hist)
        (declare (ignore senv hist))
        (syntax-check '(_ datum) form)
-       (output/constant (cadr form))))
+       (constant-item (cadr form))))
     ,expression))
 
 (define (optimized-cons rename compare a d)

diff --git a/src/runtime/syntax.scm b/src/runtime/syntax.scm
index c3930f328f4c6ba28bbdf51660eb6798cfa1ccf1..901c006298e16f55f74fc9ae70d2485758a9acc4 100644 (file)
--- a/src/runtime/syntax.scm
+++ b/src/runtime/syntax.scm
@@ -399,13 +399,9 @@ USA.
   (apply error rest))
 
 (define (classifier->keyword classifier)
-  (item->keyword (classifier-item classifier)))
-
-(define (compiler->keyword compiler)
-  (item->keyword (compiler-item compiler)))
-
-(define (item->keyword item)
-  (close-syntax 'keyword (make-keyword-senv 'keyword item)))
+  (close-syntax 'keyword
+               (make-keyword-senv 'keyword
+                                  (classifier-item classifier))))
 
 (define (capture-syntactic-environment expander)
   `(,(classifier->keyword