Changeset 14703

Timestamp:

Mar 30, 2011, 4:58:06 PM (14 years ago)

Author:

R. Matthew Emerson

Message:

In nx-declared-inline-p and nx-declared-notinline-p, stop searching
and return nil if there's a local function definition.

Fixes ticket:840.

Location:

trunk/source/compiler

Files:

• nx-basic.lisp (modified) (1 diff)
• nx0.lisp (modified) (1 diff)

trunk/source/compiler/nx-basic.lisp

@@ -596 +596 @@
                  (eq (cadr decl) 'inline))
         (return-from nx-declared-inline-p (eq (cddr decl) 'inline))))
+    (when (assq sym (lexenv.functions env))
+      (return nil))
     (setq env (lexenv.parent-env env))))
 

trunk/source/compiler/nx0.lisp

@@ -1934 +1934 @@
                  (eq (cadr decl) 'inline))
          (return-from nx-declared-notinline-p (eq (cddr decl) 'notinline))))
+    (when (assq sym (lexenv.functions env))
+      (return nil))
     (setq env (lexenv.parent-env env))))