cl-types: Integrate into CL-Lib

* lisp/emacs-lisp/cl-extra.el (cl--type-unique, cl-types-of)
(cl--type-dispatch-list, cl--type-generalizer): Move to `cl-extra.el`.
(cl--type-generalizers): New function extracted from "cl-types-of"
method of `cl-generic-generalizers`.

* lisp/emacs-lisp/cl-lib.el (cl-generic-generalizers): New method to
dispatch on derived types.  Use `cl--type-generalizers`.

* lisp/emacs-lisp/cl-macs.el (cl-deftype): Move from `cl-types.el`
and rename from `cl-deftype2`.
(extended-char): Tweak definition to fix bootstrapping issues.

* lisp/emacs-lisp/cl-preloaded.el (cl--type-list, cl-type-class)
(cl--type-deftype): Move from `cl-types.el`.

* lisp/emacs-lisp/oclosure.el (oclosure): Don't abuse `cl-deftype` to
register the predicate function.

* test/lisp/emacs-lisp/cl-extra-tests.el: Move tests from
`cl-type-tests.el`.

2 files changed, 92 insertions, 96 deletions

diff --git a/test/lisp/emacs-lisp/cl-extra-tests.el b/test/lisp/emacs-lisp/cl-extra-tests.el
index 20d1e532a6f..1f94d71e567 100644
--- a/test/lisp/emacs-lisp/cl-extra-tests.el
+++ b/test/lisp/emacs-lisp/cl-extra-tests.el
@@ -348,4 +348,96 @@
     (should (cl-tailp l l))
     (should (not (cl-tailp '(4 5) l)))))
 
+;;;; Method dispatch for derived types.
+
+(cl-deftype multiples-of (&optional m)
+  (let ((multiplep (if (eq m '*)
+                       #'ignore
+                     (lambda (n) (= 0 (% n m))))))
+    `(and integer (satisfies ,multiplep))))
+
+(cl-deftype multiples-of-2 ()
+  '(multiples-of 2))
+
+(cl-deftype multiples-of-3 ()
+  '(multiples-of 3))
+
+(cl-deftype multiples-of-4 ()
+  (declare (parents multiples-of-2))
+  '(and multiples-of-2 (multiples-of 4)))
+
+(cl-deftype unsigned-byte (&optional bits)
+  "Unsigned integer."
+  `(integer 0 ,(if (eq bits '*) bits (1- (ash 1 bits)))))
+
+(cl-deftype unsigned-16bits ()
+  "Unsigned 16-bits integer."
+  (declare (parents unsigned-byte))
+  '(unsigned-byte 16))
+
+(cl-deftype unsigned-8bits ()
+  "Unsigned 8-bits integer."
+  (declare (parents unsigned-16bits))
+  '(unsigned-byte 8))
+
+(cl-defmethod my-foo ((_n unsigned-byte))
+  (format "unsigned"))
+
+(cl-defmethod my-foo ((_n unsigned-16bits))
+  (format "unsigned 16bits - also %s"
+          (cl-call-next-method)))
+
+(cl-defmethod my-foo ((_n unsigned-8bits))
+  (format "unsigned 8bits - also %s"
+          (cl-call-next-method)))
+
+(ert-deftest cl-types-test ()
+  "Test types definition, cl-types-of and method dispatching."
+
+  ;; Invalid DAG error
+  ;; FIXME: We don't test that any more.
+  ;; (should-error
+  ;;  (eval
+  ;;   '(cl-deftype unsigned-16bits ()
+  ;;      "Unsigned 16-bits integer."
+  ;;      (declare (parents unsigned-8bits))
+  ;;      '(unsigned-byte 16))
+  ;;   lexical-binding
+  ;;   ))
+
+  ;; Test that (cl-types-of 4) is (multiples-of-4 multiples-of-2 ...)
+  ;; Test that (cl-types-of 6) is (multiples-of-3 multiples-of-2 ...)
+  ;; Test that (cl-types-of 12) is (multiples-of-4 multiples-of-3 multiples-of-2 ...)
+  (let ((types '(multiples-of-2 multiples-of-3 multiples-of-4)))
+    (should (equal '(multiples-of-2)
+                   (seq-intersection (cl-types-of 2) types)))
+
+    (should (equal '(multiples-of-4 multiples-of-2)
+                   (seq-intersection (cl-types-of 4) types)))
+
+    (should (equal '(multiples-of-3 multiples-of-2)
+                   (seq-intersection (cl-types-of 6) types)))
+
+    (should (member (seq-intersection (cl-types-of 12) types)
+                    ;; Order between 3 and 4/2 is undefined.
+                    '((multiples-of-3 multiples-of-4 multiples-of-2)
+                      (multiples-of-4 multiples-of-2 multiples-of-3))))
+
+    (should (equal '()
+                   (seq-intersection (cl-types-of 5) types)))
+    )
+
+  ;;; Method dispatching.
+  (should (equal "unsigned 8bits - also unsigned 16bits - also unsigned"
+                 (my-foo 100)))
+
+  (should (equal "unsigned 16bits - also unsigned"
+                 (my-foo 256)))
+
+  (should (equal "unsigned"
+                 (my-foo most-positive-fixnum)))
+  )
+
+
+
 ;;; cl-extra-tests.el ends here
diff --git a/test/lisp/emacs-lisp/cl-types-tests.el b/test/lisp/emacs-lisp/cl-types-tests.el
deleted file mode 100644
index 746270578e7..00000000000
--- a/test/lisp/emacs-lisp/cl-types-tests.el
+++ /dev/null
@@ -1,96 +0,0 @@
-;;; Test `cl-typedef' -*- lexical-binding: t; -*-
-;;
-(require 'ert)
-(require 'cl-types)
-
-(cl-deftype2 multiples-of (&optional m)
-  (let ((multiplep (if (eq m '*)
-                       #'ignore
-                     (lambda (n) (= 0 (% n m))))))
-    `(and integer (satisfies ,multiplep))))
-
-(cl-deftype2 multiples-of-2 ()
-  '(multiples-of 2))
-
-(cl-deftype2 multiples-of-3 ()
-  '(multiples-of 3))
-
-(cl-deftype2 multiples-of-4 ()
-  (declare (parents multiples-of-2))
-  '(and multiples-of-2 (multiples-of 4)))
-
-(cl-deftype2 unsigned-byte (&optional bits)
-  "Unsigned integer."
-  `(integer 0 ,(if (eq bits '*) bits (1- (ash 1 bits)))))
-
-(cl-deftype2 unsigned-16bits ()
-  "Unsigned 16-bits integer."
-  (declare (parents unsigned-byte))
-  '(unsigned-byte 16))
-
-(cl-deftype2 unsigned-8bits ()
-  "Unsigned 8-bits integer."
-  (declare (parents unsigned-16bits))
-  '(unsigned-byte 8))
-
-(cl-defmethod my-foo ((_n unsigned-byte))
-  (format "unsigned"))
-
-(cl-defmethod my-foo ((_n unsigned-16bits))
-  (format "unsigned 16bits - also %s"
-          (cl-call-next-method)))
-
-(cl-defmethod my-foo ((_n unsigned-8bits))
-  (format "unsigned 8bits - also %s"
-          (cl-call-next-method)))
-
-(ert-deftest cl-types-test ()
-  "Test types definition, cl-types-of and method dispatching."
-
-  ;; Invalid DAG error
-  ;; FIXME: We don't test that any more.
-  ;; (should-error
-  ;;  (eval
-  ;;   '(cl-deftype2 unsigned-16bits ()
-  ;;      "Unsigned 16-bits integer."
-  ;;      (declare (parents unsigned-8bits))
-  ;;      '(unsigned-byte 16))
-  ;;   lexical-binding
-  ;;   ))
-
-  ;; Test that (cl-types-of 4) is (multiples-of-4 multiples-of-2 ...)
-  ;; Test that (cl-types-of 6) is (multiples-of-3 multiples-of-2 ...)
-  ;; Test that (cl-types-of 12) is (multiples-of-4 multiples-of-3 multiples-of-2 ...)
-  (let ((types '(multiples-of-2 multiples-of-3 multiples-of-4)))
-    (should (equal '(multiples-of-2)
-                   (seq-intersection (cl-types-of 2) types)))
-
-    (should (equal '(multiples-of-4 multiples-of-2)
-                   (seq-intersection (cl-types-of 4) types)))
-
-    (should (equal '(multiples-of-3 multiples-of-2)
-                   (seq-intersection (cl-types-of 6) types)))
-
-    (should (member (seq-intersection (cl-types-of 12) types)
-                    ;; Order between 3 and 4/2 is undefined.
-                    '((multiples-of-3 multiples-of-4 multiples-of-2)
-                      (multiples-of-4 multiples-of-2 multiples-of-3))))
-
-    (should (equal '()
-                   (seq-intersection (cl-types-of 5) types)))
-    )
-
-  ;;; Method dispatching.
-  (should (equal "unsigned 8bits - also unsigned 16bits - also unsigned"
-                 (my-foo 100)))
-
-  (should (equal "unsigned 16bits - also unsigned"
-                 (my-foo 256)))
-
-  (should (equal "unsigned"
-                 (my-foo most-positive-fixnum)))
-  )
-
-(provide 'cl-types-tests)
-
-;;; cl-types-tests.el ends here