X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=genutils.lisp;h=4565089ddd7f66baba8742dfacddf828e2046531;hb=c0fe2c8fed48e08ef1ebb324f50d13db0d6d5042;hp=09d595d77c5304dd1153df418690f71260e8f8af;hpb=d78955696cc7e6fa8c50a880085c019f506c8bd9;p=kmrcl.git diff --git a/genutils.lisp b/genutils.lisp index 09d595d..4565089 100644 --- a/genutils.lisp +++ b/genutils.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Apr 2000 ;;;; -;;;; $Id: genutils.lisp,v 1.10 2002/11/08 06:43:34 kevin Exp $ +;;;; $Id: genutils.lisp,v 1.13 2002/12/14 18:51:53 kevin Exp $ ;;;; ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -20,17 +20,13 @@ (in-package :kmrcl) (declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3))) -(defmacro bind-when ((bind-var boundForm) &body body) - `(let ((,bind-var ,boundForm)) - (declare (ignore-if-unused ,bind-var)) - (when ,bind-var - ,@body))) +(defmacro let-when ((var test-form) &body body) + `(let ((,var ,test-form)) + (when ,var ,@body))) -(defmacro bind-if ((bind-var boundForm) yup &optional nope) - `(let ((,bind-var ,boundForm)) - (if ,bind-var - ,yup - ,nope))) +(defmacro let-if ((var test-form) if-true &optional if-false) + `(let ((,var ,test-form)) + (if ,var ,if-true ,if-false))) ;; Anaphoric macros @@ -160,6 +156,12 @@ (if val (push val acc)))) (nreverse acc))) +(defun appendnew (l1 l2) + "Append two lists, filtering out elem from second list that are already in first list" + (dolist (elem l2) + (unless (find elem l1) + (setq l1 (append l1 (list elem))))) + l1) ;; Functions @@ -329,15 +331,6 @@ (terpri ostrm))) -;;; Symbol functions - -(defmacro concat-symbol (&rest args) - `(intern (concatenate 'string ,@args))) - -(defmacro concat-symbol-pkg (pkg &rest args) - `(intern (concatenate 'string ,@args) ,pkg)) - - ;;; IO