0.8.10.57:

[sbcl.git] / src / compiler / locall.lisp

diff --git a/src/compiler/locall.lisp b/src/compiler/locall.lisp
index fa366db..8ebe63a 100644 (file)
--- a/src/compiler/locall.lisp
+++ b/src/compiler/locall.lisp
@@ -468,26 +468,11 @@
     (cond ((= n-call-args nargs)
           (convert-call ref call fun))
          (t
-          ;; FIXME: ANSI requires in "3.2.5 Exceptional Situations in the
-          ;; Compiler" that calling a function with "the wrong number of
-          ;; arguments" be only a STYLE-ERROR. I think, though, that this
-          ;; should only apply when the number of arguments is inferred
-          ;; from a previous definition. If the number of arguments
-          ;; is DECLAIMed, surely calling with the wrong number is a
-          ;; real WARNING. As long as SBCL continues to use CMU CL's
-          ;; non-ANSI DEFUN-is-a-DECLAIM policy, we're in violation here,
-          ;; but as long as we continue to use that policy, that's the
-          ;; not our biggest problem.:-| When we fix that policy, this
-          ;; should come back into compliance. (So fix that policy!)
-          ;;   ..but..
-          ;; FIXME, continued: Except that section "3.2.2.3 Semantic
-          ;; Constraints" says that if it's within the same file, it's
-          ;; wrong. And we're in locall.lisp here, so it's probably
-          ;; (haven't checked this..) a call to something in the same
-          ;; file. So maybe it deserves a full warning anyway.
-          (compiler-warn
+          (warn
+           'local-argument-mismatch
+           :format-control
            "function called with ~R argument~:P, but wants exactly ~R"
-           n-call-args nargs)
+           :format-arguments (list n-call-args nargs))
           (setf (basic-combination-kind call) :error)))))
 \f
 ;;;; &OPTIONAL, &MORE and &KEYWORD calls
@@ -504,11 +489,11 @@
        (max-args (optional-dispatch-max-args fun))
        (call-args (length (combination-args call))))
     (cond ((< call-args min-args)
-          ;; FIXME: See FIXME note at the previous
-          ;; wrong-number-of-arguments warnings in this file.
-          (compiler-warn
+          (warn
+           'local-argument-mismatch
+           :format-control
            "function called with ~R argument~:P, but wants at least ~R"
-           call-args min-args)
+           :format-arguments (list call-args min-args))
           (setf (basic-combination-kind call) :error))
          ((<= call-args max-args)
           (convert-call ref call
@@ -518,11 +503,12 @@
          ((optional-dispatch-more-entry fun)
           (convert-more-call ref call fun))
          (t
-          ;; FIXME: See FIXME note at the previous
-          ;; wrong-number-of-arguments warnings in this file.
-          (compiler-warn
+          (warn
+           'local-argument-mismatch
+           :format-control
            "function called with ~R argument~:P, but wants at most ~R"
-           call-args max-args)
+           :format-arguments
+           (list call-args max-args))
           (setf (basic-combination-kind call) :error))))
   (values))