r3555: *** empty log message ***

diff --git a/genutils.lisp b/genutils.lisp
index 09d595d77c5304dd1153df418690f71260e8f8af..fafc9024f028b14641619481bd15b0fbcd0838e1 100644 (file)
--- 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.11 2002/12/04 16:49:23 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
 

diff --git a/package.lisp b/package.lisp
index 080b81e4add94199b872ddae23709bd7c650ab88..757c9165bcff0bbeff02aa588d3e9e9722f32fb0 100644 (file)
--- a/package.lisp
+++ b/package.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: package.lisp,v 1.14 2002/12/03 00:54:08 kevin Exp $
+;;;; $Id: package.lisp,v 1.15 2002/12/04 16:49:23 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -23,8 +23,8 @@
 (defpackage #:kmrcl
   (:nicknames :kl)
   (:use :common-lisp)
-  (:export #:bind-if
-          #:bind-when
+  (:export #:let-if
+          #:let-when
           #:aif
          #:awhen
          #:awhile

diff --git a/xml-utils.lisp b/xml-utils.lisp
index 756d3393021635efedb68a22d9b3af9c76143551..20029fe109a29b449736cffb0955099790c73e1e 100644 (file)
--- a/xml-utils.lisp
+++ b/xml-utils.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: xml-utils.lisp,v 1.5 2002/11/25 07:45:36 kevin Exp $
+;;;; $Id: xml-utils.lisp,v 1.6 2002/12/04 16:49:23 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -17,7 +17,7 @@
 ;;;; *************************************************************************
 
 (in-package :kmrcl)
-(declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3)))
+(declaim (optimize (speed 3) (safety 2) (compilation-speed 0) (debug 3)))
 
 
 (defun wrap-with-xml (str entity)
@@ -52,7 +52,8 @@
             (if bracketpos
                 (let* ((starttag (1+ bracketpos))
                        (endtag (+ starttag taglen)))
-                  (if (string= tag xmlstr :start2 starttag :end2 endtag)
+                  (if (and (< endtag end-xmlstr)
+                           (string= tag xmlstr :start2 starttag :end2 endtag))
                       (let* ((char-after-tag (char xmlstr endtag)))
                         (declare (character char-after-tag))
                         (if (or (char= #\> char-after-tag) (char= #\space char-after-tag))