Eliminate non-hygienic-macro-transformer.

diff --git a/src/runtime/mit-syntax.scm b/src/runtime/mit-syntax.scm
index 686a6f1b0acbf18553c5573e95e94114d466b79c..dff676ab2eb7bd1c4522cdb2a8006257ae14f78d 100644 (file)
--- a/src/runtime/mit-syntax.scm
+++ b/src/runtime/mit-syntax.scm
@@ -59,10 +59,6 @@ USA.
   ;; "Explicit Renaming" transformer
   (transformer-keyword 'ER-MACRO-TRANSFORMER->EXPANDER
                       er-macro-transformer->expander))
-
-(define classifier:non-hygienic-macro-transformer
-  (transformer-keyword 'NON-HYGIENIC-MACRO-TRANSFORMER->EXPANDER
-                      non-hygienic-macro-transformer->expander))
 \f
 ;;;; Core primitives
 

diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index 9cb593867ba6f20ca6be0e0e479e9e594bd9e31b..e4e711d0c54f3b60d7d21fb7a3b094ef1adc3e95 100644 (file)
--- a/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@ -4656,7 +4656,6 @@ USA.
   (parent (runtime syntax))
   (export ()
          er-macro-transformer->expander
-         non-hygienic-macro-transformer->expander
          rsc-macro-transformer->expander
          sc-macro-transformer->expander
          syntactic-keyword->item))
@@ -4671,7 +4670,6 @@ USA.
          classifier:er-macro-transformer
          classifier:let-syntax
          classifier:letrec-syntax
-         classifier:non-hygienic-macro-transformer
          classifier:rsc-macro-transformer
          classifier:sc-macro-transformer
          compiler:delay

diff --git a/src/runtime/syntax-definitions.scm b/src/runtime/syntax-definitions.scm
index e2dce3857131acd7412879c513fed0e912101bd8..a8f3a738d2b80b52c6de2a26102a056615888bed 100644 (file)
--- a/src/runtime/syntax-definitions.scm
+++ b/src/runtime/syntax-definitions.scm
@@ -46,8 +46,6 @@ USA.
   (define-classifier 'ER-MACRO-TRANSFORMER classifier:er-macro-transformer)
   (define-classifier 'LET-SYNTAX classifier:let-syntax)
   (define-classifier 'LETREC-SYNTAX classifier:letrec-syntax)
-  (define-classifier 'NON-HYGIENIC-MACRO-TRANSFORMER
-    classifier:non-hygienic-macro-transformer)
   (define-classifier 'RSC-MACRO-TRANSFORMER classifier:rsc-macro-transformer)
   (define-classifier 'SC-MACRO-TRANSFORMER classifier:sc-macro-transformer)
 

diff --git a/src/runtime/syntax-environment.scm b/src/runtime/syntax-environment.scm
index a8c42782af5424de813c0364b79d8f807a927fbb..b642c0a30d40140fec500975b7c642b6740b5abd 100644 (file)
--- a/src/runtime/syntax-environment.scm
+++ b/src/runtime/syntax-environment.scm
@@ -117,11 +117,7 @@ USA.
      (if (interpreter-environment? env) 'runtime-top-level 'runtime))
    (lambda (env name)
      (and (symbol? name)
-         (let ((item (environment-lookup-macro env name)))
-           (if (procedure? item)
-               ;; **** Kludge to support bootstrapping.
-               (non-hygienic-macro-transformer->expander item env)
-               item))))
+         (environment-lookup-macro env name)))
    (lambda (env name item)
      (environment-define-macro env name item))
    (lambda (env name)

diff --git a/src/runtime/syntax-transforms.scm b/src/runtime/syntax-transforms.scm
index 730810adc3924e3151a5e55a1df9bdc4224df7a6..f5c1a041915c5b9bc4273e97c77ae50f58e46135 100644 (file)
--- a/src/runtime/syntax-transforms.scm
+++ b/src/runtime/syntax-transforms.scm
@@ -68,14 +68,6 @@ USA.
     (identifier=? use-environment x
                  use-environment y)))
 
-(define (non-hygienic-macro-transformer->expander transformer
-                                                 closing-environment)
-  closing-environment
-  (make-expander-item
-   (lambda (form use-environment)
-     (close-syntax (apply transformer (cdr form))
-                  use-environment))))
-
 (define (syntactic-keyword->item keyword environment)
   (let ((item (environment-lookup-macro environment keyword)))
     (if (not item)