X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fdefconstant.lisp;h=db7d6286a2e7c769a1fe88d821cea1d979f356ad;hb=19319c931fc1636835dbef71808cc10e252bcf45;hp=0b6f423095ed7f13d1b39bf36b3e35f1ba5b5571;hpb=68664fcaa607ab61bc53bce1e9795622942135a4;p=sbcl.git diff --git a/src/compiler/defconstant.lisp b/src/compiler/defconstant.lisp index 0b6f423..db7d628 100644 --- a/src/compiler/defconstant.lisp +++ b/src/compiler/defconstant.lisp @@ -24,9 +24,9 @@ (unless (symbolp name) (error "The constant name is not a symbol: ~S" name)) (when (looks-like-name-of-special-var-p name) - (style-warn "defining ~S as a constant, even though the name follows~@ -the usual naming convention (names like *FOO*) for special variables" - name)) + (style-warn 'sb!kernel:asterisks-around-constant-variable-name + :format-control "defining ~S as a constant" + :format-arguments (list name))) (sb!c:with-source-location (source-location) (setf (info :source-location :constant name) source-location)) (let ((kind (info :variable :kind name))) @@ -43,7 +43,7 @@ the usual naming convention (names like *FOO*) for special variables" (if (boundp name) (if (typep name '(or boolean keyword)) ;; Non-continuable error. - (about-to-modify-symbol-value name "define ~S as a constant") + (about-to-modify-symbol-value name 'defconstant) (let ((old (symbol-value name))) (unless (eql value old) (multiple-value-bind (ignore aborted) @@ -57,7 +57,7 @@ the usual naming convention (names like *FOO*) for special variables" (when aborted (return-from sb!c::%defconstant name)))))) (warn "redefining a MAKUNBOUND constant: ~S" name))) - (:global + (:unknown ;; (This is OK -- undefined variables are of this kind. So we ;; don't warn or error or anything, just fall through.) )