Some minor tweaks that were missed in earlier commits.

diff --git a/src/runtime/mit-syntax.scm b/src/runtime/mit-syntax.scm
index a1890a4f6cb67da7bad2f0dd3b1c85830b859ea0..1f23fa4ac9e36786b1c248e7114d8927bb61eef4 100644 (file)
--- a/src/runtime/mit-syntax.scm
+++ b/src/runtime/mit-syntax.scm
@@ -61,17 +61,17 @@ USA.
 
 (define (classifier:lambda form senv hist)
   (syntax-check '(_ mit-bvl + form) form)
-  (compile-lambda scode-lambda-name:unnamed
-                 (cadr form)
-                 form senv hist))
+  (classify-lambda scode-lambda-name:unnamed
+                  (cadr form)
+                  form senv hist))
 
 (define (classifier:named-lambda form senv hist)
   (syntax-check '(_ (identifier . mit-bvl) + form) form)
-  (compile-lambda (identifier->symbol (caadr form))
-                 (cdadr form)
-                 form senv hist))
+  (classify-lambda (identifier->symbol (caadr form))
+                  (cdadr form)
+                  form senv hist))
 
-(define (compile-lambda name bvl form senv hist)
+(define (classify-lambda name bvl form senv hist)
   (let ((senv (make-internal-senv senv)))
     ;; Force order -- bind names before classifying body.
     (let ((bvl

diff --git a/src/runtime/syntax-definitions.scm b/src/runtime/syntax-definitions.scm
index cf8966a3b22d604a82eb067810405630c5283601..55053e8e16861204c22981d7f76fc6d17c8a1f39 100644 (file)
--- a/src/runtime/syntax-definitions.scm
+++ b/src/runtime/syntax-definitions.scm
@@ -40,17 +40,17 @@ USA.
    (define-classifier 'begin classifier:begin)
    (define-classifier 'declare classifier:declare)
    (define-classifier 'define-syntax classifier:define-syntax)
+   (define-classifier 'delay classifier:delay)
    (define-classifier 'er-macro-transformer classifier:er-macro-transformer)
    (define-classifier 'if classifier:if)
+   (define-classifier 'lambda classifier:lambda)
    (define-classifier 'let-syntax classifier:let-syntax)
    (define-classifier 'letrec-syntax classifier:letrec-syntax)
+   (define-classifier 'named-lambda classifier:named-lambda)
    (define-classifier 'or classifier:or)
    (define-classifier 'quote classifier:quote)
    (define-classifier 'quote-identifier classifier:quote-identifier)
    (define-classifier 'rsc-macro-transformer classifier:rsc-macro-transformer)
    (define-classifier 'sc-macro-transformer classifier:sc-macro-transformer)
    (define-classifier 'set! classifier:set!)
-   (define-classifier 'the-environment classifier:the-environment)
-   (define-classifier 'delay classifier:delay)
-   (define-classifier 'lambda classifier:lambda)
-   (define-classifier 'named-lambda classifier:named-lambda)))
\ No newline at end of file
+   (define-classifier 'the-environment classifier:the-environment)))
\ No newline at end of file

diff --git a/src/runtime/syntax.scm b/src/runtime/syntax.scm
index 9f2ed2eb2c6d396300719f9461cd54fae300b8ba..8b386b0e07dc5ce3a18d5bd2a795796ddf74d1cf 100644 (file)
--- a/src/runtime/syntax.scm
+++ b/src/runtime/syntax.scm
@@ -105,17 +105,12 @@ USA.
                 (else
                  (if (not (list? (cdr form)))
                      (syntax-error "Combination must be a proper list:" form))
-                 (expr-item
-                  (let ((items
-                         (classify-forms (cdr form)
-                                         senv
-                                         (hist-cdr hist))))
-                    (lambda ()
-                      (output/combination
-                       (compile-expr-item item)
-                       (map compile-expr-item items)))))))))
+                 (combination-item item
+                                   (classify-forms (cdr form)
+                                                   senv
+                                                   (hist-cdr hist)))))))
        (else
-        (expr-item (lambda () (output/constant form))))))
+        (constant-item form))))
 
 (define (classify-form-car form senv hist)
   (classify-form (car form) senv (hist-car hist)))