X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Flate-type.lisp;h=61f6982bef789ffa926f1809be72964845ab0405;hb=d656401927393487e28e1b765f868822370c1be3;hp=b1df87bc4e79ebb2f426b8852598d51724281f06;hpb=508bf17fa9e609c523a2795d84a3bc908db1b302;p=sbcl.git

diff --git a/src/code/late-type.lisp b/src/code/late-type.lisp
index b1df87b..61f6982 100644
--- a/src/code/late-type.lisp
+++ b/src/code/late-type.lisp
@@ -887,7 +887,7 @@
 ;;; shared logic for unions and intersections: Make a COMPOUND-TYPE
 ;;; object whose components are the types in TYPES, or skip to special
 ;;; cases when TYPES is short.
-(defun make-compound-type-or-something (constructor types enumerable identity)
+(defun make-probably-compound-type (constructor types enumerable identity)
   (declare (type function constructor))
   (declare (type (vector ctype) types))
   (declare (type ctype identity))
@@ -901,7 +901,7 @@
 		;; brain-dead, so that would generate a full call to
 		;; SPECIFIER-TYPE at runtime, so we get into bootstrap
 		;; problems in cold init because 'LIST is a compound
-		;; type, so we need to MAKE-COMPOUND-TYPE-OR-SOMETHING
+		;; type, so we need to MAKE-PROBABLY-COMPOUND-TYPE
 		;; before we know what 'LIST is. Once the COERCE
 		;; optimizer is less brain-dead, we can make this
 		;; (COERCE TYPES 'LIST) again.
@@ -949,11 +949,11 @@
 	       :specifier `(and ,@(map 'list
 				       #'type-specifier
 				       simplified-types)))))
-	(make-compound-type-or-something #'%make-intersection-type
-					 simplified-types
-					 (some #'type-enumerable
-					       simplified-types)
-					 *universal-type*))))
+	(make-probably-compound-type #'%make-intersection-type
+				     simplified-types
+				     (some #'type-enumerable
+					   simplified-types)
+				     *universal-type*))))
 
 (defun type-union (&rest input-types)
   (%type-union input-types))
@@ -964,10 +964,10 @@
   (let ((simplified-types (simplified-compound-types input-types
 						     #'union-type-p
 						     #'type-union2)))
-    (make-compound-type-or-something #'make-union-type
-				     simplified-types
-				     (every #'type-enumerable simplified-types)
-				     *empty-type*)))
+    (make-probably-compound-type #'make-union-type
+				 simplified-types
+				 (every #'type-enumerable simplified-types)
+				 *empty-type*)))
 
 ;;;; built-in types