projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8.9.48:
[sbcl.git]
/
src
/
code
/
late-type.lisp
diff --git
a/src/code/late-type.lisp
b/src/code/late-type.lisp
index
ff45e57
..
6992712
100644
(file)
--- a/
src/code/late-type.lisp
+++ b/
src/code/late-type.lisp
@@
-307,6
+307,10
@@
((csubtypep type1 (specifier-type 'function)) nil)
(t :call-other-method)))
(!define-type-method (function :complex-union2) (type1 type2)
((csubtypep type1 (specifier-type 'function)) nil)
(t :call-other-method)))
(!define-type-method (function :complex-union2) (type1 type2)
+ (declare (ignore type2))
+ ;; TYPE2 is a FUNCTION type. If TYPE1 is a classoid type naming
+ ;; FUNCTION, then it is the union of the two; otherwise, there is no
+ ;; special union.
(cond
((type= type1 (specifier-type 'function)) type1)
(t nil)))
(cond
((type= type1 (specifier-type 'function)) type1)
(t nil)))
@@
-1031,11
+1035,6
@@
(!define-type-class named)
(!define-type-class named)
-(defvar *wild-type*)
-(defvar *empty-type*)
-(defvar *universal-type*)
-(defvar *universal-fun-type*)
-
(!cold-init-forms
(macrolet ((frob (name var)
`(progn
(!cold-init-forms
(macrolet ((frob (name var)
`(progn