From 3fa2d81a67d2077d2d037456a62e431243497ea6 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Sun, 11 Feb 2018 21:17:30 -0800
Subject: [PATCH] Eliminate compiler->keyword.

---
 src/runtime/runtime.pkg      |  1 -
 src/runtime/syntax-rules.scm |  4 ++--
 src/runtime/syntax.scm       | 10 +++-------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index 8ba7bb7a5..d05fd214b 100644
--- 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 fbbe91413..6f94dc051 100644
--- 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 c3930f328..901c00629 100644
--- 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
-- 
2.25.1