From 5385b537ad1e6622d482df28810217dbf7329b32 Mon Sep 17 00:00:00 2001
From: William Harold Newman <william.newman@airmail.net>
Date: Thu, 3 Jul 2003 00:08:41 +0000
Subject: [PATCH] 0.8.1.16: 	compiler WARNING tweaks 	other
 message tweaks

---
 make.sh                |    8 ++++++++
 src/compiler/main.lisp |   25 ++++++++++++++++++++++---
 version.lisp-expr      |    2 +-
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/make.sh b/make.sh
index 8626c85..080b45a 100755
--- a/make.sh
+++ b/make.sh
@@ -118,4 +118,12 @@ sh make-target-1.sh || exit 1
 sh make-host-2.sh   || exit 1
 sh make-target-2.sh || exit 1
 sh make-target-contrib.sh || exit 1
+
+# Sometimes people used to see the "No tests failed." output from the last
+# DEFTEST in contrib self-tests and thing that's all that is. So...
+echo
+echo The build seems to have finished successfully. If you would like
+echo run more extensive tests on the new SBCL, you can try run-tests.sh.
+echo
+
 date
diff --git a/src/compiler/main.lisp b/src/compiler/main.lisp
index 49d1b70..4e0ba72 100644
--- a/src/compiler/main.lisp
+++ b/src/compiler/main.lisp
@@ -158,6 +158,12 @@
 		  (incf *aborted-compilation-unit-count*))
 		(summarize-compilation-unit (not succeeded-p)))))))))
 
+;;; Is FUN-NAME something that no conforming program can rely on
+;;; defining as a function?
+(defun fun-name-reserved-by-ansi-p (fun-name)
+  (eq (symbol-package (fun-name-block-name fun-name))
+      *cl-package*))
+
 ;;; This is to be called at the end of a compilation unit. It signals
 ;;; any residual warnings about unknown stuff, then prints the total
 ;;; error counts. ABORT-P should be true when the compilation unit was
@@ -181,11 +187,24 @@
 		(undefined-warning-count (undefined-warning-count undef)))
 	    (dolist (*compiler-error-context* warnings)
               (if #-sb-xc-host (and (eq kind :function)
-                                    (symbolp name) ; FIXME: (SETF CL:fo)
-                                    (eq (symbol-package name) *cl-package*)
+				    (fun-name-reserved-by-ansi-p name)
                                     *flame-on-necessarily-undefined-function*)
                   #+sb-xc-host nil
-                  (compiler-warn "undefined ~(~A~): ~S" kind name)
+		  (case name
+		    ((declare)
+		     (compiler-warn
+		      "~@<There is no function named ~S. References to ~S in ~
+                       some contexts (like starts of blocks) have special ~
+                       meaning, but here it would have to be a function, ~
+                       and that shouldn't be right.~:@>"
+		      name name))
+		    (t
+		     (compiler-warn
+		      "~@<The ~(~A~) ~S is undefined, and its name is ~
+                       reserved by ANSI CL so that even if it it were ~
+                       defined later, the code doing so would not be ~
+                       portable.~:@>"
+		      kind name)))
                   (compiler-style-warn "undefined ~(~A~): ~S" kind name)))
 	    (let ((warn-count (length warnings)))
 	      (when (and warnings (> undefined-warning-count warn-count))
diff --git a/version.lisp-expr b/version.lisp-expr
index 0b460ab..8f6bf03 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.8.1.15"
+"0.8.1.16"
-- 
1.7.10.4