diff options
author | Andrea Corallo <akrl@sdf.org> | 2021-02-22 13:58:30 +0100 |
---|---|---|
committer | Andrea Corallo <akrl@sdf.org> | 2021-02-22 13:59:56 +0100 |
commit | d6227f6edcff7be05469e99da4ce541bfc474c3d (patch) | |
tree | fded45fd969f963c21295860dda09c81d09be87c | |
parent | da4da88c76465e30ce974383b182f191553b470a (diff) | |
download | emacs-d6227f6edcff7be05469e99da4ce541bfc474c3d.tar.gz |
* Fix union constraint for mixed pos/neg constraints
* lisp/emacs-lisp/comp-cstr.el (comp-cstr-union-1-no-mem): Fix neg
type shadowing pos values.
* test/lisp/emacs-lisp/comp-cstr-tests.el
(comp-cstr-typespec-tests-alist): Add testcase.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Fix testcase.
-rw-r--r-- | lisp/emacs-lisp/comp-cstr.el | 6 | ||||
-rw-r--r-- | test/lisp/emacs-lisp/comp-cstr-tests.el | 4 | ||||
-rw-r--r-- | test/src/comp-tests.el | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/comp-cstr.el b/lisp/emacs-lisp/comp-cstr.el index 3c00b68d0f6..c294c53b6b0 100644 --- a/lisp/emacs-lisp/comp-cstr.el +++ b/lisp/emacs-lisp/comp-cstr.el @@ -597,6 +597,12 @@ DST is returned." (valset pos))) ;; Pos is a superset of neg. (give-up)) + ((cl-some (lambda (x) + (cl-some (lambda (y) + (comp-subtype-p y x)) + (mapcar #'type-of (valset pos)))) + (typeset neg)) + (give-up)) (t ;; pos is a subset or eq to neg (setf (valset neg) diff --git a/test/lisp/emacs-lisp/comp-cstr-tests.el b/test/lisp/emacs-lisp/comp-cstr-tests.el index b4db54666c7..f2d9bf583e5 100644 --- a/test/lisp/emacs-lisp/comp-cstr-tests.el +++ b/test/lisp/emacs-lisp/comp-cstr-tests.el @@ -211,7 +211,9 @@ ;; 85 ((or (not string) t) . t) ;; 86 - ((or (not vector) sequence) . sequence)) + ((or (not vector) sequence) . sequence) + ;; 87 + ((or (not symbol) null) . t)) "Alist type specifier -> expected type specifier.")) (defmacro comp-cstr-synthesize-tests () diff --git a/test/src/comp-tests.el b/test/src/comp-tests.el index 08c18894419..f7b5a6bbb4c 100644 --- a/test/src/comp-tests.el +++ b/test/src/comp-tests.el @@ -1185,7 +1185,7 @@ Return a list of results." ((defun comp-tests-ret-type-spec-f (x) (unless (symbolp x) x)) - (not symbol)) + t) ;; 55 ((defun comp-tests-ret-type-spec-f (x) |