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

* Rework 'comp-normalize-valset' (bug#71116)

Browse source 
* lisp/emacs-lisp/comp-cstr.el (comp-normalize-valset): Rework to
improve consistency.
This commit is contained in:
Andrea Corallo 2024-05-27 17:38:22 +02:00
parent 2cadad6f8c
commit 509e7f877b
1 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -231,20 +231,22 @@ Return them as multiple value."
(defun comp-normalize-valset (valset)
"Sort and remove duplicates from VALSET then return it."
(cl-sort (cl-remove-duplicates valset :test #'eq)
(lambda (x y)
(cond
((and (symbolp x) (symbolp y))
(string< x y))
((and (symbolp x) (not (symbolp y)))
t)
((and (not (symbolp x)) (symbolp y))
nil)
((or (consp x) (consp y)
nil))
(t
(< (sxhash-equal x)
(sxhash-equal y)))))))
;; Sort valset as much as possible (by type and by value for symbols
;; and strings) to increase cache hits. But refrain to use
;; `sxhash-equal' to be reproducible across on different builds.
(cl-loop
with vals = (cl-remove-duplicates valset :test #'eq)
with type-val = (cl-loop
for type in (cl-remove-duplicates (mapcar #'cl-type-of vals)
:test #'eq)
collect (cons type nil))
for x in vals
do (push x (cdr (assq (cl-type-of x) type-val)))
finally return (cl-loop
for (type . values) in (cl-sort type-val #'string< :key #'car)
append (if (memq type '(symbol string))
(cl-sort values #'string<)
values))))
(defun comp-union-valsets (&rest valsets)
"Union values present into VALSETS."