X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fir1tran.lisp;h=5343ea75cc5f00e5e4bca2c6766471f8336432cc;hb=a260738d7a71680079d972b102b4e4db4e8dc3ae;hp=702cf507f8ec747608c423c1d22199c25425f395;hpb=3520a51b0035094f8da72639fa72ad8a844e0982;p=sbcl.git

diff --git a/src/compiler/ir1tran.lisp b/src/compiler/ir1tran.lisp
index 702cf50..5343ea7 100644
--- a/src/compiler/ir1tran.lisp
+++ b/src/compiler/ir1tran.lisp
@@ -657,27 +657,12 @@
 		;; or the cross-compiler which encountered the problem?"
 		#+sb-xc-host "(in cross-compiler macroexpansion of ~S)"
 		form))))
-      (handler-bind (;; When cross-compiling, we can get style warnings
-                     ;; about e.g. undefined functions. An unhandled
-                     ;; CL:STYLE-WARNING (as opposed to a
-                     ;; SB!C::COMPILER-NOTE) would cause FAILURE-P to be
-                     ;; set on the return from #'SB!XC:COMPILE-FILE, which
-                     ;; would falsely indicate an error sufficiently
-                     ;; serious that we should stop the build process. To
-                     ;; avoid this, we translate CL:STYLE-WARNING
-                     ;; conditions from the host Common Lisp into
-                     ;; cross-compiler SB!C::COMPILER-NOTE calls. (It
-                     ;; might be cleaner to just make Python use
-                     ;; CL:STYLE-WARNING internally, so that the
-                     ;; significance of any host Common Lisp
-                     ;; CL:STYLE-WARNINGs is understood automatically. But
-                     ;; for now I'm not motivated to do this. -- WHN
-                     ;; 19990412)
-                     (style-warning (lambda (c)
-                                      (compiler-note "~@<~A~:@_~A~:@_~A~:>"
-						     (wherestring) hint c)
-                                      (muffle-warning-or-die)))
-                     ;; KLUDGE: CMU CL in its wisdom (version 2.4.6 for
+      (handler-bind ((style-warning (lambda (c)
+				      (compiler-style-warn
+				       "~@<~A~:@_~A~@:_~A~:>"
+				       (wherestring) hint c)
+				      (muffle-warning-or-die)))
+		     ;; KLUDGE: CMU CL in its wisdom (version 2.4.6 for
                      ;; Debian Linux, anyway) raises a CL:WARNING
                      ;; condition (not a CL:STYLE-WARNING) for undefined
                      ;; symbols when converting interpreted functions,
@@ -692,7 +677,7 @@
                      ;; and this code does so, by crudely suppressing all
                      ;; warnings in cross-compilation macroexpansion. --
                      ;; WHN 19990412
-                     #+cmu
+                     #+(and cmu sb-xc-host)
                      (warning (lambda (c)
                                 (compiler-note
                                  "~@<~A~:@_~
@@ -709,6 +694,11 @@
                                  (wherestring)
                                  c)
                                 (muffle-warning-or-die)))
+		     #-(and cmu sb-xc-host)
+		     (warning (lambda (c)
+				(compiler-warn "~@<~A~:@_~A~@:_~A~:>"
+					       (wherestring) hint c)
+				(muffle-warning-or-die)))
                      (error (lambda (c)
                               (compiler-error "~@<~A~:@_~A~@:_~A~:>"
                                               (wherestring) hint c))))
@@ -1204,15 +1194,12 @@
 	   (make-lambda-var :%source-name name)))))
 
 ;;; Make the default keyword for a &KEY arg, checking that the keyword
-;;; isn't already used by one of the VARS. We also check that the
-;;; keyword isn't the magical :ALLOW-OTHER-KEYS.
+;;; isn't already used by one of the VARS.
 (declaim (ftype (function (symbol list t) keyword) make-keyword-for-arg))
 (defun make-keyword-for-arg (symbol vars keywordify)
   (let ((key (if (and keywordify (not (keywordp symbol)))
 		 (keywordicate symbol)
 		 symbol)))
-    (when (eq key :allow-other-keys)
-      (compiler-error "No &KEY arg can be called :ALLOW-OTHER-KEYS."))
     (dolist (var vars)
       (let ((info (lambda-var-arg-info var)))
 	(when (and info
@@ -1639,7 +1626,8 @@
 	      (n-allowp (gensym "N-ALLOWP-"))
 	      (n-losep (gensym "N-LOSEP-"))
 	      (allowp (or (optional-dispatch-allowp res)
-			  (policy *lexenv* (zerop safety)))))
+			  (policy *lexenv* (zerop safety))))
+              (found-allow-p nil))
 
 	  (temps `(,n-index (1- ,n-count)) n-key n-value-temp)
 	  (body `(declare (fixnum ,n-index) (ignorable ,n-key ,n-value-temp)))
@@ -1650,24 +1638,30 @@
 		     (default (arg-info-default info))
 		     (keyword (arg-info-key info))
 		     (supplied-p (arg-info-supplied-p info))
-		     (n-value (gensym "N-VALUE-")))
-		(temps `(,n-value ,default))
-		(cond (supplied-p
-		       (let ((n-supplied (gensym "N-SUPPLIED-")))
-			 (temps n-supplied)
-			 (arg-vals n-value n-supplied)
-			 (tests `((eq ,n-key ',keyword)
-				  (setq ,n-supplied t)
-				  (setq ,n-value ,n-value-temp)))))
-		      (t
-		       (arg-vals n-value)
-		       (tests `((eq ,n-key ',keyword)
-				(setq ,n-value ,n-value-temp)))))))
+		     (n-value (gensym "N-VALUE-"))
+                     (clause (cond (supplied-p
+                                    (let ((n-supplied (gensym "N-SUPPLIED-")))
+                                      (temps n-supplied)
+                                      (arg-vals n-value n-supplied)
+                                      `((eq ,n-key ',keyword)
+                                        (setq ,n-supplied t)
+                                        (setq ,n-value ,n-value-temp))))
+                                   (t
+                                    (arg-vals n-value)
+                                    `((eq ,n-key ',keyword)
+                                      (setq ,n-value ,n-value-temp))))))
+		(when (and (not allowp) (eq keyword :allow-other-keys))
+                  (setq found-allow-p t)
+                  (setq clause (append clause `((setq ,n-allowp ,n-value-temp)))))
+
+                (temps `(,n-value ,default))
+		(tests clause)))
 
 	    (unless allowp
 	      (temps n-allowp n-losep)
-	      (tests `((eq ,n-key :allow-other-keys)
-		       (setq ,n-allowp ,n-value-temp)))
+              (unless found-allow-p
+                (tests `((eq ,n-key :allow-other-keys)
+                         (setq ,n-allowp ,n-value-temp))))
 	      (tests `(t
 		       (setq ,n-losep ,n-key))))