diff --git a/alexandria-1/tests.lisp b/alexandria-1/tests.lisp index 5068f8597696be7eedbf7799077ad4ce72371cd7..b960ada11b06e32b86d64857d04fcb1b6a0eee7a 100644 --- a/alexandria-1/tests.lisp +++ b/alexandria-1/tests.lisp @@ -1781,14 +1781,18 @@ t) (deftest type=.2 - (type= 'list '(or null cons)) - t + (multiple-value-bind (= ok) + (type= 'list '(or null cons)) + (or (and = ok) + (and (not =) (not ok)))) t) #-allegro (deftest type=.3 - (type= 'null '(and symbol list)) - t + (multiple-value-bind (= ok) + (type= 'null '(and symbol list)) + (or (and = ok) + (and (not =) (not ok)))) t) (deftest type=.4 @@ -1800,6 +1804,16 @@ nil t) +(defun type=.6.stringp (thing) + (not (not (stringp thing)))) + +(deftest type=.6 + (multiple-value-bind (= ok) + (type= '(or string (satisfies type=.6.stringp)) 'string) + (or (and = ok) + (and (not =) (not ok)))) + t) + (macrolet ((test (type numbers) `(deftest ,(format-symbol t '#:cdr5.~a (string type))