Changeset 14463

Timestamp:

Dec 2, 2010, 12:23:36 AM (9 years ago)

Author:

rme

Message:

In NX1-FUNCTION, ensure that we have a lambda expression before calling
NX1-REF-INNER-FUNCTION.

File:

• trunk/source/compiler/nx1.lisp (modified) (1 diff)

trunk/source/compiler/nx1.lisp

@@ -1308 +1308 @@
   (nx1-treat-as-call w))
 
-
 (defnx1 nx1-function function (arg &aux fn afunc)
-  (if (symbolp arg)
-    (progn
-      (when (macro-function arg *nx-lexical-environment*)
-        (nx-error
-         "~S can't be used to reference lexically visible macro ~S." 
-         'function arg))
-      (if (multiple-value-setq (fn afunc) (nx-lexical-finfo arg))
-        (progn
-          (when afunc 
-            (incf (afunc-fn-refcount afunc))
-            (when (%ilogbitp $fbitbounddownward (afunc-bits afunc))
-              (incf (afunc-fn-downward-refcount afunc))))
-          (nx1-symbol (%cddr fn)))
-        (progn
-          (while (setq fn (assq arg *nx-synonyms*))
-            (setq arg (%cdr fn)))
-          (nx1-form `(%function ',arg)))))
-    (if (and (consp arg) (eq (%car arg) 'setf))
-      (nx1-form `(function ,(nx-need-function-name arg)))
-      (nx1-ref-inner-function nil arg))))
+  (cond ((symbolp arg)
+         (when (macro-function arg *nx-lexical-environment*)
+           (nx-error
+            "~S can't be used to reference lexically visible macro ~S." 
+            'function arg))
+         (if (multiple-value-setq (fn afunc) (nx-lexical-finfo arg))
+           (progn
+             (when afunc 
+               (incf (afunc-fn-refcount afunc))
+               (when (%ilogbitp $fbitbounddownward (afunc-bits afunc))
+                 (incf (afunc-fn-downward-refcount afunc))))
+             (nx1-symbol (%cddr fn)))
+           (progn
+             (while (setq fn (assq arg *nx-synonyms*))
+               (setq arg (%cdr fn)))
+             (nx1-form `(%function ',arg)))))
+        ((setf-function-name-p arg)
+         (nx1-form `(function ,(nx-need-function-name arg))))
+        ((lambda-expression-p arg)
+         (nx1-ref-inner-function nil arg))
+        (t
+         (nx-error "~S is not a function name or lambda expression" arg))))
 
 (defnx1 nx1-nfunction nfunction (name def)