0.pre7.141:

[sbcl.git] / src / compiler / proclaim.lisp

diff --git a/src/compiler/proclaim.lisp b/src/compiler/proclaim.lisp
index faef555..0a62a5c 100644 (file)
--- a/src/compiler/proclaim.lisp
+++ b/src/compiler/proclaim.lisp
@@ -19,7 +19,7 @@
 (defvar *undefined-warnings*)
 (declaim (list *undefined-warnings*))
 
-;;; Look up some symbols in *FREE-VARIABLES*, returning the var
+;;; Look up some symbols in *FREE-VARS*, returning the var
 ;;; structures for any which exist. If any of the names aren't
 ;;; symbols, we complain.
 (declaim (ftype (function (list) list) get-old-vars))
@@ -28,7 +28,7 @@
     (dolist (name names (vars))
       (unless (symbolp name)
        (compiler-error "The name ~S is not a symbol." name))
-      (let ((old (gethash name *free-variables*)))
+      (let ((old (gethash name *free-vars*)))
        (when old (vars old))))))
 
 ;;; Return a new POLICY containing the policy information represented
@@ -45,12 +45,12 @@
              (destructuring-bind (quality raw-value) q-and-v-or-just-q
                (values quality raw-value)))
        (cond ((not (policy-quality-name-p quality))
-              (compiler-warning "ignoring unknown optimization quality ~
-                                 ~S in ~S"
-                                quality spec))
+              (compiler-warn "ignoring unknown optimization quality ~
+                               ~S in ~S"
+                              quality spec))
              ((not (and (typep raw-value 'real) (<= 0 raw-value 3)))
-              (compiler-warning "ignoring bad optimization value ~S in ~S"
-                                raw-value spec))
+              (compiler-warn "ignoring bad optimization value ~S in ~S"
+                             raw-value spec))
              (t
               (push (cons quality (rational raw-value))
                     result)))))
@@ -81,6 +81,8 @@
             decl-spec)))))
 
 (defun sb!xc:proclaim (raw-form)
+  #+sb-xc (/show0 "entering PROCLAIM, RAW-FORM=..")
+  #+sb-xc (/hexstr raw-form)
   (let* ((form (canonized-decl-spec raw-form))
         (kind (first form))
         (args (rest form)))
@@ -151,9 +153,10 @@
 
             ;; Now references to this function shouldn't be warned
             ;; about as undefined, since even if we haven't seen a
-            ;; definition yet, we know one is planned. (But if this
-            ;; function name was already declared as a structure
-            ;; accessor, then that was already been taken care of.)
+            ;; definition yet, we know one is planned. 
+            ;;
+            ;; Other consequences of we-know-you're-a-function-now
+            ;; are appropriate too, e.g. any MACRO-FUNCTION goes away.
             (proclaim-as-fun-name name)
             (note-name-defined name :function)
 
@@ -174,9 +177,7 @@
        (setq *policy* (process-optimize-decl form *policy*)))
       ((inline notinline maybe-inline)
        (dolist (name args)
-        ;; (CMU CL did (PROCLAIM-AS-FUN-NAME NAME) here, but that
-        ;; seems more likely to surprise the user than to help him, so
-        ;; we don't do it.)
+        (proclaim-as-fun-name name) ; since implicitly it is a function
         (setf (info :function :inlinep name)
               (ecase kind
                 (inline :inline)
@@ -191,5 +192,6 @@
         (setf (info :declaration :recognized decl) t)))
       (t
        (unless (info :declaration :recognized kind)
-        (compiler-warning "unrecognized declaration ~S" raw-form)))))
+        (compiler-warn "unrecognized declaration ~S" raw-form)))))
+  #+sb-xc (/show0 "returning from PROCLAIM")
   (values))