X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fproclaim.lisp;h=1c154ca7552ef77f8c57c1b89681551bcf5ae397;hb=cf607a404d7518e8a18c9e362913f370eb9a5e38;hp=8a616d003d1d2c509c9277d3c76390f2edc526b4;hpb=4eb1a6d3ad2b7dcc19ac0ec979a1eb1eb049659a;p=sbcl.git

diff --git a/src/compiler/proclaim.lisp b/src/compiler/proclaim.lisp
index 8a616d0..1c154ca 100644
--- 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)))))
@@ -123,8 +123,8 @@
        ;; when we have to ignore a PROCLAIM because the type system is
        ;; uninitialized.
        (when *type-system-initialized*
-	 (let ((type (specifier-type (first args))))
-	   (unless (csubtypep type (specifier-type 'function))
+	 (let ((ctype (specifier-type (first args))))
+	   (unless (csubtypep ctype (specifier-type 'function))
 	     (error "not a function type: ~S" (first args)))
 	   (dolist (name (rest args))
 
@@ -142,13 +142,13 @@
 	     #|
 	     (when (eq (info :function :where-from name) :declared)
 	       (let ((old-type (info :function :type name)))
-		 (when (type/= type old-type)
+		 (when (type/= ctype old-type)
 		   (style-warn
 		    "new FTYPE proclamation~@
                      ~S~@
                      for ~S does not match old FTYPE proclamation~@
                      ~S"
-		    (list type name old-type)))))
+		    (list ctype name old-type)))))
              |#
 
 	     ;; Now references to this function shouldn't be warned
@@ -161,7 +161,7 @@
 	     (note-name-defined name :function)
 
 	     ;; the actual type declaration
-	     (setf (info :function :type name) type
+	     (setf (info :function :type name) ctype
 		   (info :function :where-from name) :declared)))))
       (freeze-type
        (dolist (type args)
@@ -192,6 +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))