X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fir1final.lisp;h=94240a0f4b0b7866d1d871a1d93faf0eb42a87f2;hb=ad613f03c3e077e63ae871a4e1967ac57a4c59c9;hp=d0a02e379e75892dea98b8223f858a0391ee54b6;hpb=09957fcf57b49ed5ae5f05d62ad12d7ddbfd8e1d;p=sbcl.git

diff --git a/src/compiler/ir1final.lisp b/src/compiler/ir1final.lisp
index d0a02e3..94240a0 100644
--- a/src/compiler/ir1final.lisp
+++ b/src/compiler/ir1final.lisp
@@ -20,7 +20,7 @@
 (defun note-failed-optimization (node failures)
   (declare (type combination node) (list failures))
   (unless (or (node-deleted node)
-	      (not (function-info-p (combination-kind node))))
+	      (not (fun-info-p (combination-kind node))))
     (let ((*compiler-error-context* node))
       (dolist (failure failures)
 	(let ((what (cdr failure))
@@ -29,16 +29,16 @@
 	   ((consp what)
 	    (compiler-note "~@<unable to ~2I~_~A ~I~_because: ~2I~_~?~:>"
 			   note (first what) (rest what)))
-	   ((valid-function-use node what
-				:argument-test #'types-equal-or-intersect
-				:result-test #'values-types-equal-or-intersect)
+	   ((valid-fun-use node what
+			   :argument-test #'types-equal-or-intersect
+			   :result-test #'values-types-equal-or-intersect)
 	    (collect ((messages))
-	      (flet ((frob (string &rest stuff)
+	      (flet ((give-grief (string &rest stuff)
 		       (messages string)
 		       (messages stuff)))
-		(valid-function-use node what
-				    :warning-function #'frob
-				    :error-function #'frob))
+		(valid-fun-use node what
+			       :unwinnage-fun #'give-grief
+			       :lossage-fun #'give-grief))
 	      (compiler-note "~@<unable to ~
                               ~2I~_~A ~
                               ~I~_due to type uncertainty: ~
@@ -53,7 +53,7 @@
 
 ;;; For each named function with an XEP, note the definition of that
 ;;; name, and add derived type information to the INFO environment. We
-;;; also delete the FUNCTIONAL from *FREE-FUNCTIONS* to eliminate the
+;;; also delete the FUNCTIONAL from *FREE-FUNS* to eliminate the
 ;;; possibility that new references might be converted to it.
 (defun finalize-xep-definition (fun)
   (let* ((leaf (functional-entry-fun fun))
@@ -63,11 +63,11 @@
       (let ((source-name (leaf-source-name leaf)))
 	(let* ((where (info :function :where-from source-name))
 	       (*compiler-error-context* (lambda-bind (main-entry leaf)))
-	       (global-def (gethash source-name *free-functions*))
+	       (global-def (gethash source-name *free-funs*))
 	       (global-p (defined-fun-p global-def)))
 	  (note-name-defined source-name :function)
 	  (when global-p
-	    (remhash source-name *free-functions*))
+	    (remhash source-name *free-funs*))
 	  (ecase where
 	    (:assumed
 	     (let ((approx-type (info :function :assumed-type source-name)))
@@ -80,10 +80,11 @@
 	     (let ((declared-ftype (info :function :type source-name)))
 	       (unless (defined-ftype-matches-declared-ftype-p
 			 defined-ftype declared-ftype)
-		 (note-lossage "~@<The previously declared FTYPE~2I ~_~S~I ~_~
-                              conflicts with the definition type ~2I~_~S~:>"
-			       (type-specifier declared-ftype)
-			       (type-specifier defined-ftype)))))
+		 (compiler-style-warn
+                  "~@<The previously declared FTYPE~2I ~_~S~I ~_~
+                   conflicts with the definition type ~2I~_~S~:>"
+                  (type-specifier declared-ftype)
+                  (type-specifier defined-ftype)))))
 	    (:defined
 	     (when global-p
 	       (setf (info :function :type source-name) defined-ftype))))))))
@@ -105,7 +106,7 @@
 	  (when (and (eq (node-component ref) component)
 		     (combination-p dest)
 		     (eq (continuation-use (basic-combination-fun dest)) ref))
-	    (setq atype (note-function-use dest atype)))))
+	    (setq atype (note-fun-use dest atype)))))
       (setf (info :function :assumed-type name) atype))))
 
 ;;; Do miscellaneous things that we want to do once all optimization
@@ -128,5 +129,5 @@
 
   (maphash (lambda (k v)
 	     (note-assumed-types component k v))
-	   *free-functions*)
+	   *free-funs*)
   (values))