Changeset 316

Timestamp:

Jan 17, 2004, 7:48:20 PM (21 years ago)

Author:

Gary Byers

Message:

WARN has to be more anal-retentive about the condition and any args it gets.

File:

• trunk/ccl/level-1/l1-readloop-lds.lisp (modified) (1 diff)

trunk/ccl/level-1/l1-readloop-lds.lisp

@@ -356 +356 @@
       nil)))
 
-(defun warn (format-string &rest args)
+(defun warn (condition-or-format-string &rest args)
+  (when (typep condition-or-format-string 'condition)
+    (unless (typep condition-or-format-string 'warning)
+      (report-bad-arg condition-or-format-string 'warning))
+    (when args
+      (error 'type-error :datum args :expected-type 'null
+             :format-control "Extra arguments in ~s.")))
   (let ((fp (%get-frame-ptr))
-        (c (require-type (condition-arg format-string args 'simple-warning) 'warning)))
+        (c (require-type (condition-arg condition-or-format-string args 'simple-warning) 'warning)))
     (when *break-on-warnings*
       (cbreak-loop "Warning" "Signal the warning." c fp))