r4980: Auto commit for Debian build

diff --git a/strings.lisp b/strings.lisp
index bfd7c984541a5e4a8abcb268ef37bec740cea132..046b357db1739e5ba6c64bd152952a2f8d4dcec6 100644 (file)
--- 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)