mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-24 06:20:43 -08:00
Code Issues Projects Releases Wiki Activity

comp-cstr.el: The type hierarchy is a DAG, not a tree

Browse source 
Adjust the type operations to account for the fact that types can have
several parents.

* lisp/emacs-lisp/comp-cstr.el (comp--cl-class-hierarchy):
Use `cl--class-allparents`.  Add FIXME.
(comp--direct-supertype): Declare obsolete.
(comp--direct-supertypes): New function.
(comp--normalize-typeset0): Rewrite to use `comp--direct-supertypes`;
adjust to account for the DAG structure; use `cl-set-difference`.
(comp--direct-subtypes): Rewrite.
(comp--intersection): New function.
(comp-supertypes): Rewrite and change return type.
(comp-subtype-p): Simplify.
(comp-union-typesets): Use `comp-supertypes` instead of iterating over
`comp-cstr-ctxt-typeof-types`.
* lisp/emacs-lisp/comp.el (comp--native-compile): Don't catch
errors if we're debugging.
* test/lisp/emacs-lisp/comp-cstr-tests.el: Adjust tests.

* lisp/emacs-lisp/cl-macs.el (cl-defstruct): Fix mishap when we
evaluate (cl-defstruct cl-structure-object ..) during the compilation
of `cl-preloaded.el`.
* lisp/emacs-lisp/cl-preloaded.el: Add corresponding assertion.
This commit is contained in:
Stefan Monnier 2023-10-30 00:59:19 -04:00
parent 271d8b70f8
commit bdec2d2d46
5 changed files with 112 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/emacs-lisp/comp.el
View file

@ -4180,7 +4180,7 @@ the deferred compilation mechanism."
(comp-log "\n \n" 1)
(unwind-protect
(progn
(condition-case err
(condition-case-unless-debug err
(cl-loop
with report = nil
for t0 = (current-time)
@ -4199,7 +4199,8 @@ the deferred compilation mechanism."
(comp-log (format "Done compiling %s" data) 0)
(cl-loop for (pass . time) in (reverse report)
do (comp-log (format "Pass %s took: %fs."
pass time) 0))))
pass time)
0))))
(native-compiler-skip)
(t
(let ((err-val (cdr err)))