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

* Use 'cl-type-of' in comp-cstr.el

Browse source 
* lisp/emacs-lisp/comp-cstr.el (comp-cstr-union-homogeneous-no-range)
(comp-cstr-union-1-no-mem, comp-cstr-intersection-no-hashcons):
Make use of 'cl-type-of' in place of 'type-of'.
This commit is contained in:
Andrea Corallo 2024-03-19 10:41:52 +01:00
parent a7cb220523
commit 0f76baeac0
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -575,7 +575,7 @@ All SRCS constraints must be homogeneously negated or non-negated."
;; We propagate only values those types are not already ;; We propagate only values those types are not already
;; into typeset. ;; into typeset.
when (cl-notany (lambda (x) when (cl-notany (lambda (x)
(comp-subtype-p (type-of v) x)) (comp-subtype-p (cl-type-of v) x))
(comp-cstr-typeset dst)) (comp-cstr-typeset dst))
collect v))) collect v)))
@ -664,7 +664,7 @@ DST is returned."
;; Verify disjoint condition between positive types and ;; Verify disjoint condition between positive types and
;; negative types coming from values, in case give-up. ;; negative types coming from values, in case give-up.
(let ((neg-value-types (nconc (mapcar #'type-of (valset neg)) (let ((neg-value-types (nconc (mapcar #'cl-type-of (valset neg))
(when (range neg) (when (range neg)
'(integer))))) '(integer)))))
(when (cl-some (lambda (x) (when (cl-some (lambda (x)
@ -685,7 +685,7 @@ DST is returned."
((cl-some (lambda (x) ((cl-some (lambda (x)
(cl-some (lambda (y) (cl-some (lambda (y)
(comp-subtype-p y x)) (comp-subtype-p y x))
(mapcar #'type-of (valset pos)))) (mapcar #'cl-type-of (valset pos))))
(typeset neg)) (typeset neg))
(give-up)) (give-up))
(t (t
@ -1108,7 +1108,7 @@ DST is returned."
(cl-loop for v in (valset dst) (cl-loop for v in (valset dst)
unless (symbolp v) unless (symbolp v)
do (push v strip-values) do (push v strip-values)
(push (type-of v) strip-types)) (push (cl-type-of v) strip-types))
(when strip-values (when strip-values
(setf (typeset dst) (comp-union-typesets (typeset dst) strip-types) (setf (typeset dst) (comp-union-typesets (typeset dst) strip-types)
(valset dst) (cl-set-difference (valset dst) strip-values))) (valset dst) (cl-set-difference (valset dst) strip-values)))