X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=lists.lisp;h=77b6fa52401157e11b78451156903100a4df6775;hb=87b59c42af7677f273e6e176e66f3306af9e2089;hp=ed2148ee347cba703e88b21cd44a1f400df42288;hpb=0f12822c9d49849c26424743b3744d26056be4cc;p=kmrcl.git

diff --git a/lists.lisp b/lists.lisp
index ed2148e..77b6fa5 100644
--- a/lists.lisp
+++ b/lists.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: lists.lisp,v 1.6 2003/06/18 17:12:29 kevin Exp $
+;;;; $Id: lists.lisp,v 1.9 2003/07/31 07:32:11 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -22,13 +22,20 @@
   "Make into list if atom"
   (if (listp obj) obj (list obj)))
 
-(defun filter (fn lst)
-  "Filter a list by function, eliminate elements where fn returns nil"
+(defun map-and-remove-nils (fn lst)
+  "mao a list by function, eliminate elements where fn returns nil"
   (let ((acc nil))
     (dolist (x lst (nreverse acc))
       (let ((val (funcall fn x)))
         (when val (push val acc))))))
 
+(defun filter (fn lst)
+  "Filter a list by function, eliminate elements where fn returns nil"
+  (let ((acc nil))
+    (dolist (x lst (nreverse acc))
+      (when (funcall fn x)
+        (push x acc)))))
+
 (defun appendnew (l1 l2)
   "Append two lists, filtering out elem from second list that are already in first list"
   (dolist (elem l2 l1)
@@ -166,7 +173,14 @@
       ((null pl) alist)
     (setq alist (acons (car pl) (cadr pl) alist))))
 
-(defun get-plist (key plist &key (test 'eql) (missing nil))
-  (let-if (pos (member key plist :test test))
-	  (cadr pos)
-	  missing))
+(defmacro update-plist (pkey value plist &key (test '#'eql))
+  "Macro to support below (setf get-alist)"
+  (let ((pos (gensym)))
+    `(let ((,pos (member ,pkey ,plist :test ,test)))
+       (if ,pos
+	   (progn
+	     (setf (cadr ,pos) ,value)
+	     ,plist)
+	 (setf ,plist (append ,plist (list ,pkey ,value)))))))
+
+