1.0.18.17: Alter some STYLE-WARNING names introduced in 1.0.18.16.

[sbcl.git] / src / compiler / early-c.lisp

diff --git a/src/compiler/early-c.lisp b/src/compiler/early-c.lisp
index 9df9131..e04ad03 100644 (file)
--- a/src/compiler/early-c.lisp
+++ b/src/compiler/early-c.lisp
@@ -29,20 +29,6 @@
   #!+sb-doc
   "The exclusive upper bound on the number of multiple VALUES that you can
   return.")
-
-(defconstant-eqx sb!xc:lambda-list-keywords
-  '(&allow-other-keys
-    &aux
-    &body
-    &environment
-    &key
-    &more
-    &optional
-    &rest
-    &whole)
-  #'equal
-  #!+sb-doc
-  "symbols which are magical in a lambda list")
 \f
 ;;;; cross-compiler-only versions of CL special variables, so that we
 ;;;; don't have weird interactions with the host compiler
@@ -123,6 +109,7 @@
 (defvar *trace-table*)
 (defvar *undefined-warnings*)
 (defvar *warnings-p*)
+(defvar *lambda-conversions*)
 
 ;;; This lock is seized in the compiler, and related areas: the
 ;;; compiler is not presently thread-safe
@@ -177,9 +164,11 @@
     ;; and then we happen to compile bar.lisp before foo.lisp.
   (when (looks-like-name-of-special-var-p symbol)
     ;; FIXME: should be COMPILER-STYLE-WARNING?
-    (style-warn "using the lexical binding of the symbol ~S, not the~@
-dynamic binding, even though the symbol name follows the usual naming~@
-convention (names like *FOO*) for special variables" symbol))
+    (style-warn 'sb!kernel:asterisks-around-lexical-variable-name
+                :format-control
+                "using the lexical binding of the symbol ~S, not the~@
+                 dynamic binding"
+                :format-arguments (list symbol)))
   (values))
 
 (def!struct (debug-name-marker (:make-load-form-fun dump-debug-name-marker)
@@ -219,8 +208,6 @@ convention (names like *FOO*) for special variables" symbol))
       *debug-name-ellipsis* (make-debug-name-marker))
 
 (defun debug-name (type thing)
-  ;; We can _always_ do better thing NIL for this.
-  (aver thing)
   (let ((*debug-name-punt* nil))
     (labels ((walk (x)
                (typecase x