projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8.1.9:
[sbcl.git]
/
src
/
code
/
late-type.lisp
diff --git
a/src/code/late-type.lisp
b/src/code/late-type.lisp
index
8e07447
..
5e00418
100644
(file)
--- a/
src/code/late-type.lisp
+++ b/
src/code/late-type.lisp
@@
-2294,7
+2294,10
@@
(mapcar (lambda (x y) (if (eq x '*) y x))
dims1 dims2)))
:complexp (if (eq complexp1 :maybe) complexp2 complexp1)
(mapcar (lambda (x y) (if (eq x '*) y x))
dims1 dims2)))
:complexp (if (eq complexp1 :maybe) complexp2 complexp1)
- :element-type (if (eq eltype1 *wild-type*) eltype2 eltype1))))
+ :element-type (cond
+ ((eq eltype1 *wild-type*) eltype2)
+ ((eq eltype2 *wild-type*) eltype1)
+ (t (type-intersection eltype1 eltype2))))))
*empty-type*))
;;; Check a supplied dimension list to determine whether it is legal,
*empty-type*))
;;; Check a supplied dimension list to determine whether it is legal,