1 files changed, 18 insertions, 5 deletions
diff --git a/test/lisp/emacs-lisp/comp-cstr-tests.el b/test/lisp/emacs-lisp/comp-cstr-tests.el
index 38a5e291311..c98ff80cd72 100644
--- a/test/lisp/emacs-lisp/comp-cstr-tests.el
+++ b/test/lisp/emacs-lisp/comp-cstr-tests.el
@@ -48,15 +48,13 @@
     ((or (or integer symbol) number) . (or symbol number))
     ((or (or integer symbol) (or number list)) . (or list symbol number))
     ((or (or integer number) nil) . number)
-    ;; ((and string array) . string)
-    ;; ((and cons atom) . (or cons atom))
-    ;; ((and (member foo) (member bar)) . symbol)
-    ;; ((and (member foo) symbol) . (member foo))
     ((member foo) . (member foo))
     ((member foo bar) . (member foo bar))
     ((or (member foo) (member bar)) . (member foo bar))
     ((or (member foo) symbol) . symbol) ;; SBCL return (OR SYMBOL (MEMBER FOO))
     ((or (member foo) number) .  (or (member foo) number))
+    ((or (integer 1 3) number) . number)
+    (integer . integer)
     ((integer 1 2) . (integer 1 2))
     ((or (integer -1  0) (integer 3  4)) . (or (integer -1  0) (integer 3  4)))
     ((or (integer -1  2) (integer 3  4)) . (integer -1 4))
@@ -64,7 +62,22 @@
     ((or (integer -1  4) (integer 3  4)) . (integer -1 4))
     ((or (integer -1  5) (integer 3  4)) . (integer -1 5))
     ((or (integer -1  *) (integer 3  4)) . (integer -1 *))
-    ((or (integer -1  2) (integer *  4)) . (integer * 4)))
+    ((or (integer -1  2) (integer *  4)) . (integer * 4))
+    ((and string array) . string)
+    ((and cons atom) . nil)
+    ((and (member foo) (member foo bar baz)) . (member foo))
+    ((and (member foo) (member bar)) . nil)
+    ((and (member foo) symbol) . (member foo))
+    ((and (member foo) string) . nil)
+    ((and (member foo) (integer 1 2)) . nil)
+    ((and (member 1 2) (member 3 2)) . (member 2))
+    ((and number (integer 1 2)) . number)
+    ((and integer (integer 1 2)) . integer)
+    ((and (integer -1 0) (integer 3 5)) . nil)
+    ((and (integer -1 2) (integer 3 5)) . nil)
+    ((and (integer -1 3) (integer 3 5)) . (integer 3 3))
+    ((and (integer -1 4) (integer 3 5)) . (integer 3 4))
+    ((and (integer -1 5) nil) . nil))
   "Alist type specifier -> expected type specifier.")
 
 (defmacro comp-cstr-synthesize-tests ()