Changeset 15352

Timestamp:

May 4, 2012, 9:21:55 PM (13 years ago)

Author:

Gary Byers

Message:

In NX1-COMBINATION, don't run alphatizer if calling a function with
the wrong number of args (warn, err at runtime.)

File:

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

trunk/source/compiler/nx0.lisp

@@ -1805 +1805 @@
   (destructuring-bind (sym &rest args) form
     (if (symbolp sym)
-      (let* ((*nx-sfname* sym) special)
-        (if (and (setq special (gethash sym *nx1-alphatizers*))
+      (let* ((*nx-sfname* sym)
+             (special (gethash sym *nx1-alphatizers*))
+             (def (fboundp sym)))
+        (if (and special
                  (not (nx-lexical-finfo sym env))
                  (or (special-operator-p sym)
-                     (not (nx-declared-notinline-p sym env))))
+                     (not (nx-declared-notinline-p sym env)))
+                 (or (not (functionp def))
+                     (null (nx1-check-call-args def (cdr form) nil))))
           (funcall special context form env) ; pass environment arg ...
           (progn