jadedctrl/activity-servist
jadedctrl/ activity-servist
1
0
Disbranĉigi 0
Fontkodo Issues Tirpetoj Activity

Fix testing of nested objects

This commit is contained in:
Jaidyn Ann 2024-06-23 12:18:41 -05:00
parent 3f3370c194
commit 4c9de6677e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
t/activity-vocabulary.lisp
View File

@ -60,15 +60,23 @@ ensuring they are semantically equivalent. White-space and key order are ignored
(lambda (cell-a cell-b) (lambda (cell-a cell-b)
(apply predicate (list (car cell-a) (car cell-b)))))) (apply predicate (list (car cell-a) (car cell-b))))))
(defun ensure-list (item)
"Ensure ITEM is either a list or the sole member of a new list."
(if (listp item)
item
(list item)))
(defun hash-table-sorted-alist (table &optional (predicate #'string<)) (defun hash-table-sorted-alist (table &optional (predicate #'string<))
"Return a sorted associative list containing the keys and values of TABLE. "Return a sorted associative list containing the keys and values of TABLE.
Any nested hash-tables found as values are also sorted, recursively." Any nested hash-tables found as values are also sorted, recursively."
(sort-alist (sort-alist
(mapcar (lambda (cell) (mapcar (lambda (cell)
(cons (car cell) (cons (car cell)
(if (hash-table-p (cdr cell)) (mapcar (lambda (cell-item)
(hash-table-sorted-alist (cdr cell)) (if (hash-table-p cell-item)
(cdr cell)))) (hash-table-sorted-alist cell-item)
cell-item))
(ensure-list (cdr cell)))))
(alexandria:hash-table-alist table)) (alexandria:hash-table-alist table))
predicate)) predicate))