Update of /cvsroot/sbcl/sbcl/src/code
In directory sc8-pr-cvs1:/tmp/cvs-serv518/src/code
Modified Files:
late-type.lisp
Log Message:
0.7.9.64:
* Fix bug in SUBTYPEP of function types, reported by Valtteri
Vuorik, explained by CSR.
* Fix 3AND.
Index: late-type.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/late-type.lisp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- late-type.lisp 11 Nov 2002 10:33:02 -0000 1.62
+++ late-type.lisp 24 Nov 2002 06:08:39 -0000 1.63
@@ -237,13 +237,13 @@
(multiple-value-bind (val2 win2) ,y
(if (and val1 val2)
(values t t)
- (values nil (or win1 win2))))))))
+ (values nil (and win2 (not val2)))))))))
(3and (values-subtypep (fun-type-returns type1)
(fun-type-returns type2))
(cond ((fun-type-wild-args type2) (values t t))
((fun-type-wild-args type1) (values nil t))
- ((not (or (fun-type-simple-p type1)
- (fun-type-simple-p type2)))
+ ((not (and (fun-type-simple-p type1)
+ (fun-type-simple-p type2)))
(values nil nil))
(t (multiple-value-bind (min1 max1) (fun-type-nargs type1)
(multiple-value-bind (min2 max2) (fun-type-nargs type2)
|