;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: genutils.lisp,v 1.9 2002/11/07 22:08:41 kevin Exp $
+;;;; $Id: genutils.lisp,v 1.12 2002/12/13 21:59:57 kevin Exp $
;;;;
;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
(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
(strm (gensym)))
`(let ((,strm ,stream)
(,eof ',eof-value))
- (do ((,var (read-line ,strm nil ,eof) (read-line ,strm nil ,eof)))
- ((eql ,var ,eof))
- ,@body))))
+ (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)))
`(with-open-file (,stream ,file :direction :input)
- (with-each-stream-line (,var ,stream)
- ,@body))))
+ (with-each-stream-line (,var ,stream)
+ ,@body))))
;;; Keyword functions
(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
(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))