Changeset 12807 for branches/generic-class-file/abcl/src/org/armedbear/lisp/precompiler.lisp

Timestamp:

07/15/10 22:06:43 (13 years ago)

Author:

ehuelsmann

Message:

Backport r12796-12805 from trunk.

Reduces the current 37 ANSI failures to 34.

File:

• branches/generic-class-file/abcl/src/org/armedbear/lisp/precompiler.lisp (modified) (1 diff)

branches/generic-class-file/abcl/src/org/armedbear/lisp/precompiler.lisp

@@ -789 +789 @@
         (operator (car form))
         (locals (cadr form))
-        ;; precompile (thus macro-expand) the body before inspecting it
-        ;; for the use of our locals and optimizing them away
-        (body (mapcar #'precompile1 (cddr form))))
+  body)
+    ;; first augment the environment with the newly-defined local functions
+    ;; to shadow preexisting macro definitions with the same names
+    (dolist (local locals)
+      (environment-add-function-definition *precompile-env*
+             (car local) (cddr local)))
+    ;; then precompile (thus macro-expand) the body before inspecting it
+    ;; for the use of our locals and optimizing them away
+    (setq body (mapcar #'precompile1 (cddr form)))
     (dolist (local locals)
       (let* ((name (car local))