Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv10204

Modified Files: basic-macros.lisp Log Message: Removed bogus macro that expanded if in terms of cond. This would i.e. confuse some tree-walking stuff in loop's expander.

Date: Sun Aug 14 18:39:39 2005 Author: ffjeld

Index: movitz/losp/muerte/basic-macros.lisp diff -u movitz/losp/muerte/basic-macros.lisp:1.61 movitz/losp/muerte/basic-macros.lisp:1.62 --- movitz/losp/muerte/basic-macros.lisp:1.61 Wed May 4 00:15:38 2005 +++ movitz/losp/muerte/basic-macros.lisp Sun Aug 14 18:39:39 2005 @@ -9,7 +9,7 @@ ;;;; Created at: Wed Nov 8 18:44:57 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: basic-macros.lisp,v 1.61 2005/05/03 22:15:38 ffjeld Exp $ +;;;; $Id: basic-macros.lisp,v 1.62 2005/08/14 16:39:39 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------

@@ -106,9 +106,6 @@

(define-compiler-macro cond (&body cond-body) (cons 'compiled-cond cond-body)) - -(defmacro if (test-form then-form &optional else-form) - `(cond (,test-form ,then-form) (t ,else-form)))

(define-compiler-macro if (test-form then-form &optional else-form &environment env) (when (and (movitz:movitz-constantp then-form env) (movitz:movitz-constantp else-form env))