projects
/
kmrcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r3629: *** empty log message ***
[kmrcl.git]
/
genutils.lisp
diff --git
a/genutils.lisp
b/genutils.lisp
index 6125aba7262e95696eac18ee766088f75f42b406..4565089ddd7f66baba8742dfacddf828e2046531 100644
(file)
--- a/
genutils.lisp
+++ b/
genutils.lisp
@@
-7,7
+7,7
@@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: genutils.lisp,v 1.
8 2002/11/07 04:07:02
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
;;;;
;;;;
;;;; 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)))
(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
;; Anaphoric macros
@@
-160,6
+156,12
@@
(if val (push val acc))))
(nreverse acc)))
(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
;; Functions
@@
-218,17
+220,19
@@
(defmacro with-each-stream-line ((var stream) &body body)
(let ((eof (gensym))
(defmacro with-each-stream-line ((var stream) &body body)
(let ((eof (gensym))
+ (eof-value (gensym))
(strm (gensym)))
(strm (gensym)))
- `(let ((,strm ,stream))
- (do ((,var (read-line stream nil ,eof) (read-line stream nil ,eof)))
- (eq ,var ,eof)
- ,@body))))
+ `(let ((,strm ,stream)
+ (,eof ',eof-value))
+ (do ((,var (read-line ,strm nil ,eof) (read-line ,strm nil ,eof)))
+ ((eql ,var ,eof))
+ ,@body))))
(defmacro with-each-file-line ((var file) &body body)
(let ((stream (gensym)))
(defmacro with-each-file-line ((var file) &body body)
(let ((stream (gensym)))
- `(with-open-file (,stream file :direction :input)
-
(with-each-stream-line (,var ,stream)
-
,@body))))
+ `(with-open-file (,stream
,
file :direction :input)
+ (with-each-stream-line (,var ,stream)
+ ,@body))))
;;; Keyword functions
;;; Keyword functions
@@
-327,15
+331,6
@@
(terpri ostrm)))
(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
;;; IO
@@
-383,9
+378,9
@@
(defun file-subst (old new file1 file2)
(with-open-file (in file1 :direction :input)
(defun file-subst (old new file1 file2)
(with-open-file (in file1 :direction :input)
-
(with-open-file (out file2 :direction :output
-
:if-exists :supersede)
-
(stream-subst old new in out))))
+ (with-open-file (out file2 :direction :output
+ :if-exists :supersede)
+ (stream-subst old new in out))))
(defun stream-subst (old new in out)
(declare (string old new))
(defun stream-subst (old new in out)
(declare (string old new))