From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Fri, 16 May 2003 12:50:05 +0000 (+0000)
Subject: r4980: Auto commit for Debian build
X-Git-Tag: v1.96~203
X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=commitdiff_plain;h=174fa156fb8e0c29acec43058a155a99f188e860

r4980: Auto commit for Debian build
---

diff --git a/strings.lisp b/strings.lisp
index bfd7c98..046b357 100644
--- a/strings.lisp
+++ b/strings.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: strings.lisp,v 1.30 2003/05/16 08:37:20 kevin Exp $
+;;;; $Id: strings.lisp,v 1.31 2003/05/16 12:50:05 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -30,19 +30,21 @@
 
 (defun count-string-words (str)
   (declare (simple-string str)
-	   (optimize (speed 3) (safety 0)))
+	   (optimize (speed 3) (safety 0) (space 0)))
   (let ((n-words 0)
 	(in-word nil))
     (declare (fixnum n-words))
-    (dotimes (i (length str))
-      (let ((ch (char str i)))
+    (do* ((len (length str))
+	  (i 0 (1+ i)))
+	((= i len) n-words)
+      (declare (fixnum i))
+      (let ((ch (schar str i)))
 	(declare (character ch))
 	(if (alphanumericp ch)
 	    (unless in-word
 	      (incf n-words)
 	      (setq in-word t))
-	  (setq in-word nil))))
-    n-words))
+	  (setq in-word nil))))))
 
 ;; From Larry Hunter with modifications
 (defun position-char (char string start max)