Changeset 13525

Timestamp:

08/21/11 14:06:31 (10 years ago)

Author:

ehuelsmann

Message:

Fix #163: Local functions should shadow global macro and function bindings.

File:

• trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp

@@ -1229 +1229 @@
        (cond
          ((symbolp op)
+          (when (find-local-function op)
+            ;; local functions shadow macros and functions in
+            ;; the global environment as well as compiler macros
+            (return-from p1
+              (p1-function-call form)))
           (when (compiler-macro-function op)
             (unless (notinline-p op)