X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=lists.lisp;h=336baa02864fd29363c82ef90949aed6e6cfddae;hb=035b66e6fe51559e2db70691ddcae4ab641a4873;hp=77b6fa52401157e11b78451156903100a4df6775;hpb=042a035d9708f98f43b41ac07171ee0570658c8b;p=kmrcl.git diff --git a/lists.lisp b/lists.lisp index 77b6fa5..336baa0 100644 --- a/lists.lisp +++ b/lists.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Apr 2000 ;;;; -;;;; $Id: lists.lisp,v 1.9 2003/07/31 07:32:11 kevin Exp $ +;;;; $Id$ ;;;; ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -42,13 +42,15 @@ (unless (find elem l1) (setq l1 (append l1 (list elem)))))) -(defun remove-tree-if (pred tree) +(defun remove-from-tree-if (pred tree atom-processor) "Strip from tree of atoms that satistify predicate" (if (atom tree) (unless (funcall pred tree) - tree) - (let ((car-strip (remove-tree-if pred (car tree))) - (cdr-strip (remove-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)) @@ -169,7 +171,7 @@ (defun plist-alist (plist) (do ((alist '()) - (pl plist (cddr plist))) + (pl plist (cddr pl))) ((null pl) alist) (setq alist (acons (car pl) (cadr pl) alist))))