procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/emacs-lisp/comp-cstr.el (comp-cstr-type-p): Improve last change.

Browse source
This commit is contained in:
Andrea Corallo 2024-04-10 18:45:47 +02:00
parent ee03a73375
commit 3eb462405e
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lisp/emacs-lisp/comp-cstr.el
View file

@ -941,16 +941,27 @@ Non memoized version of `comp-cstr-intersection-no-mem'."
(null (neg cstr))
(equal (typeset cstr) '(cons)))))
(define-inline comp-cstr-type-p (cstr type)
(defun comp-cstr-type-p (cstr type)
"Return t if CSTR is certainly of type TYPE."
(if-let ((pred (get type 'cl-deftype-satisfies)))
(when
(with-comp-cstr-accessors
(and (null (range cstr))
(null (neg cstr))
(and (or (null (typeset cstr))
(equal (typeset cstr) `(,type)))
(cl-every pred (valset cstr)))))
(error "Unknown predicate for type %s" type)))
(cl-case type
(integer
(if (or (valset cstr) (neg cstr))
nil
(or (equal (typeset cstr) '(integer))
(and (range cstr)
(or (null (typeset cstr))
(equal (typeset cstr) '(integer)))))))
(t
(if-let ((pred (get type 'cl-deftype-satisfies)))
(and (null (range cstr))
(null (neg cstr))
(and (or (null (typeset cstr))
(equal (typeset cstr) `(,type)))
(cl-every pred (valset cstr))))
(error "Unknown predicate for type %s" type)))))
t))
;; Move to comp.el?
(defsubst comp-cstr-cl-tag-p (cstr)