X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Ftype.before-xc.lisp;h=5b03e452efa3c80925df133f9abb47798f3750f7;hb=c3699db2053ff3b5ac6a98d4431c3789496002d8;hp=5dc0ca3febbc3c729c9d798ece33d0061586e370;hpb=f0670f28705c01e79fb23cb2a582074d3e51ec98;p=sbcl.git

diff --git a/tests/type.before-xc.lisp b/tests/type.before-xc.lisp
index 5dc0ca3..5b03e45 100644
--- a/tests/type.before-xc.lisp
+++ b/tests/type.before-xc.lisp
@@ -58,6 +58,23 @@
 	     (type-intersection (specifier-type '(satisfies keywordp))
 				*empty-type*)))
 
+(assert (type= (specifier-type 'list)
+	       (type-union (specifier-type 'cons) (specifier-type 'null))))
+(assert (type= (specifier-type 'list)
+	       (type-union (specifier-type 'null) (specifier-type 'cons))))
+(assert (type= (specifier-type 'sequence)
+	       (type-union (specifier-type 'list) (specifier-type 'vector))))
+(assert (type= (specifier-type 'sequence)
+	       (type-union (specifier-type 'vector) (specifier-type 'list))))
+(assert (type= (specifier-type 'list)
+	       (type-union (specifier-type 'cons) (specifier-type 'list))))
+(assert (not (csubtypep (type-union (specifier-type 'list)
+				    (specifier-type '(satisfies foo)))
+			(specifier-type 'list))))
+(assert (csubtypep (specifier-type 'list)
+		   (type-union (specifier-type 'list)
+			       (specifier-type '(satisfies foo)))))
+
 ;;; Identities should be identities.
 (dolist (type-specifier '(nil
 			  t
@@ -87,22 +104,15 @@
     (assert (type= ctype (type-intersection2 ctype *universal-type*)))
     (assert (type= ctype (type-intersection2 *universal-type* ctype)))
       
-    ;; FIXME: TYPE-UNION still acts CMU-CL-ish as of 0.6.11.13, so
-    ;; e.g. (TYPE-UNION #<HAIRY-TYPE (SATISFIES KEYWORDP)> *EMPTY-TYPE*)
-    ;; returns a UNION-TYPE instead of the HAIRY-TYPE. When that's
-    ;; fixed, these tests should be enabled.
-    ;;(assert (eql ctype (type-union ctype *empty-type*)))
-    ;;(assert (eql ctype (type-union *empty-type* ctype)))
-
-    ;; FIXME: TYPE-UNION2 is not defined yet as of 0.6.11.13, and when
-    ;; it's defined, these tests should be enabled.
-    ;;(assert (eql *empty-type* (type-union2 ctype *empty-type*)))
-    ;;(assert (eql *empty-type* (type-union2 *empty-type* ctype)))
-
-    ;;(assert (eql *universal-type* (type-union ctype *universal-type*)))
-    ;;(assert (eql *universal-type* (type-union *universal-type* ctype)))
-    ;;(assert (eql ctype (type-union2 ctype *universal-type*)))
-    ;;(assert (eql ctype (type-union2 *universal-type* ctype)))
+    (assert (eql *universal-type* (type-union ctype *universal-type*)))
+    (assert (eql *universal-type* (type-union *universal-type* ctype)))
+    (assert (eql *universal-type* (type-union2 ctype *universal-type*)))
+    (assert (eql *universal-type* (type-union2 *universal-type* ctype)))
+
+    (assert (type= ctype (type-union ctype *empty-type*)))
+    (assert (type= ctype (type-union *empty-type* ctype)))
+    (assert (type= ctype (type-union2 ctype *empty-type*)))
+    (assert (type= ctype (type-union2 *empty-type* ctype)))
 
     (assert (csubtypep *empty-type* ctype))
     (assert (csubtypep ctype *universal-type*))))
@@ -118,14 +128,11 @@
   (assert-secondnil (sb-xc:subtypep t '(satisfies foo)))
   (assert-secondnil (sb-xc:subtypep t '(and (satisfies foo) (satisfies bar))))
   (assert-secondnil (sb-xc:subtypep t '(or (satisfies foo) (satisfies bar))))
-  ;; FIXME: Enable these tests when bug 84 is fixed.
-  #|
   (assert-secondnil (sb-xc:subtypep '(satisfies foo) nil))
   (assert-secondnil (sb-xc:subtypep '(and (satisfies foo) (satisfies bar))
 				    nil))
   (assert-secondnil (sb-xc:subtypep '(or (satisfies foo) (satisfies bar))
-				    nil))
-  |#)
+				    nil)))
 
 ;;; tests of 2-value quantifieroids FOO/TYPE
 (macrolet ((2= (v1 v2 expr2)
@@ -172,5 +179,34 @@
 (assert (null (type-intersection2 (specifier-type 'symbol)
 				  (specifier-type '(satisfies foo)))))
 (assert (intersection-type-p (specifier-type '(and symbol (satisfies foo)))))
+(assert (ctypep :x86 (specifier-type '(satisfies keywordp))))
+(assert (type= (specifier-type '(member :x86))
+	       (specifier-type '(and (member :x86) (satisfies keywordp)))))
+(let* ((type1 (specifier-type '(member :x86)))
+       (type2 (specifier-type '(or keyword null)))
+       (isect (type-intersection type1 type2)))
+  (assert (type= isect type1))
+  (assert (type= isect (type-intersection type2 type1)))
+  (assert (type= isect (type-intersection type2 type1 type2)))
+  (assert (type= isect (type-intersection type1 type1 type2 type1)))
+  (assert (type= isect (type-intersection type1 type2 type1 type2))))
+(let* ((type1 (specifier-type 'keyword))
+       (type2 (specifier-type '(or keyword null)))
+       (isect (type-intersection type1 type2)))
+  (assert (type= isect type1))
+  (assert (type= isect (type-intersection type2 type1)))
+  (assert (type= isect (type-intersection type2 type1 type2)))
+  (assert (type= isect (type-intersection type1 type1 type2 type1)))
+  (assert (type= isect (type-intersection type1 type2 type1 type2))))
+(assert (csubtypep (specifier-type '(or (single-float -1.0 1.0)
+					(single-float 0.1)))
+		   (specifier-type '(or (real -1 7)
+					(single-float 0.1)
+					(single-float -1.0 1.0)))))
+(assert (not (csubtypep (specifier-type '(or (real -1 7)
+					     (single-float 0.1)
+					     (single-float -1.0 1.0)))
+			(specifier-type '(or (single-float -1.0 1.0)
+					     (single-float 0.1))))))
 
 (/show "done with tests/type.before-xc.lisp")