Update of /cvsroot/sbcl/sbcl/src/compiler
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv14634/src/compiler
Modified Files:
ctype.lisp
Log Message:
1.0.36.37: fix minor regression from 1.0.36.33
* Don't patch the &REST into the type when it has * for args.
Index: ctype.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/ctype.lisp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- ctype.lisp 19 Mar 2010 20:35:16 -0000 1.36
+++ ctype.lisp 23 Mar 2010 17:52:10 -0000 1.37
@@ -607,6 +607,7 @@
(frob (- (optional-dispatch-max-args od) min) (length opt) "optional"))
(flet ((frob (x y what)
(unless (eq x y)
+ (break "~S" type)
(note-lossage
"The definition ~:[doesn't have~;has~] ~A, but ~
~A ~:[doesn't~;does~]."
@@ -796,7 +797,8 @@
(optional-dispatch-p fun)
(optional-dispatch-keyp fun)
(optional-dispatch-more-entry fun)
- (not (fun-type-rest type)))
+ (not (or (fun-type-rest type)
+ (fun-type-wild-args type))))
(make-fun-type :required (fun-type-required type)
:optional (fun-type-optional type)
:rest *universal-type*
|