X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=lists.lisp;h=3115dd5dbe1b99476baf576be214fe4353615686;hp=35e74ba3482236cf8dd4f01cfc6948de66e273bd;hb=526eef1b59e071cbb4ecd35f73a14c1a3f8e32b6;hpb=eb3a19183eef0273cb4bec74259f98802fb141f0 diff --git a/lists.lisp b/lists.lisp index 35e74ba..3115dd5 100644 --- a/lists.lisp +++ b/lists.lisp @@ -42,13 +42,15 @@ (unless (find elem l1) (setq l1 (append l1 (list elem)))))) -(defun remove-from-tree-if (pred tree) +(defun remove-from-tree-if (pred tree &optional atom-processor) "Strip from tree of atoms that satistify predicate" (if (atom tree) (unless (funcall pred tree) - tree) - (let ((car-strip (remove-from-tree-if pred (car tree))) - (cdr-strip (remove-from-tree-if pred (cdr tree)))) + (if atom-processor + (funcall atom-processor tree) + tree)) + (let ((car-strip (remove-from-tree-if pred (car tree) atom-processor)) + (cdr-strip (remove-from-tree-if pred (cdr tree) atom-processor))) (cond ((and car-strip (atom (cadr tree)) (null cdr-strip)) (list car-strip)) @@ -155,12 +157,13 @@ (progn (setf (cdr ,elem) ,value) ,alist) - (setf ,alist (acons ,akey ,value ,alist)))))) + (setf ,alist (acons ,akey ,value ,alist)))))) (defun get-alist (key alist &key (test #'eql)) (cdr (assoc key alist :test test))) (defun (setf get-alist) (value key alist &key (test #'eql)) + "This doesn't work to add a field which alist value is only modified locally" (update-alist key value alist :test test) value)