From ac40a60696322cd92f37fcddda97ae9c00226bf8 Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Sat, 5 Dec 2020 23:42:25 +0100 Subject: Couple of `comp-cstr-union-1-no-mem' improvements for mixed neg pos union * lisp/emacs-lisp/comp-cstr.el (comp-cstr-union-1-no-mem): Generalize disjoint pos types vs neg values conditions. (comp-cstr-union-1-no-mem): Do not propagate ranges when we are already returning integer as generic type. * test/lisp/emacs-lisp/comp-cstr-tests.el (comp-cstr-typespec-tests-alist): Add corresponding tests. --- test/lisp/emacs-lisp/comp-cstr-tests.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'test/lisp/emacs-lisp') diff --git a/test/lisp/emacs-lisp/comp-cstr-tests.el b/test/lisp/emacs-lisp/comp-cstr-tests.el index bc772fcb0d2..6e1d0d463e1 100644 --- a/test/lisp/emacs-lisp/comp-cstr-tests.el +++ b/test/lisp/emacs-lisp/comp-cstr-tests.el @@ -81,7 +81,7 @@ ((not symbol) . (not symbol)) ((or (member foo) (not (member foo bar))) . (not (member bar))) ((or (member foo bar) (not (member foo))) . t) - ;; Intentionally conservative, see `comp-cstr-union'. + ;; Intentionally conservative, see `comp-cstr-union-1-no-mem'. ((or symbol (not sequence)) . t) ((or symbol (not symbol)) . t) ;; Conservative. @@ -98,7 +98,10 @@ ((or (member foo) (not string)) . (not string)) ((or (not (integer 1 2)) integer) . integer) ((or (not (integer 1 2)) (not integer)) . (not integer)) - ((or (integer 1 2) (not integer)) . (not (or integer (integer * 0) (integer 3 *))))) + ((or (integer 1 2) (not integer)) . (not (or integer (integer * 0) (integer 3 *)))) + ((or number (not (integer 1 2))) . t) + ((or atom (not (integer 1 2))) . t) + ((or atom (not (member foo))) . t)) "Alist type specifier -> expected type specifier.") (defmacro comp-cstr-synthesize-tests () -- cgit v1.2.3