r5143: Auto commit for Debian build

diff --git a/kmrcl.asd b/kmrcl.asd
index 19fe091abd1239d45a0685ac0a7fddaf39817c67..607233c76103ecb5132841a7384c479a75076cc6 100644 (file)
--- a/kmrcl.asd
+++ b/kmrcl.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: kmrcl.asd,v 1.31 2003/06/12 02:38:39 kevin Exp $
+;;;; $Id: kmrcl.asd,v 1.32 2003/06/17 06:18:09 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -38,7 +38,7 @@
      (:file "seqs" :depends-on ("macros"))
      (:file "io" :depends-on ("macros"))
      (:file "console" :depends-on ("macros"))
-     (:file "strings" :depends-on ("macros"))
+     (:file "strings" :depends-on ("macros" "seqs"))
      (:file "buff-input" :depends-on ("macros"))
      (:file "telnet-server" :depends-on ("macros"))
      (:file "random" :depends-on ("macros"))

diff --git a/strings.lisp b/strings.lisp
index 08aec10ea8e92262ebcb92097ab5effab402f63c..7bd949dc34f5272002e9760164e8deb2bbe09161 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.42 2003/06/15 13:49:42 kevin Exp $
+;;;; $Id: strings.lisp,v 1.43 2003/06/17 06:18:09 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -169,7 +169,6 @@
 
 (defun replaced-string-length (str repl-alist)
   (declare (simple-string str)
-          (fixnum orig-len new-len)
           (optimize (speed 3) (safety 0) (space 0)))
     (do* ((i 0 (1+ i))
          (orig-len (length str))
@@ -180,7 +179,8 @@
             (match (assoc c repl-alist :test #'char=)))
        (declare (character c))
        (when match
-         (incf new-len (1- (length (cdr match))))))))
+         (incf new-len (1- (length
+                            (the simple-string (cdr match)))))))))
 
 (defun substitute-chars-strings (str repl-alist)
   "Replace all instances of a chars with a string. repl-alist is an assoc
@@ -274,7 +274,8 @@ Leading zeros are present."
   (do* ((zero-code (char-code #\0))
        (result (make-string len :initial-element #\0))
        (minus? (minusp num))
-       (val (if minus? (- 0 num) num) (floor (/ val 10)))
+       (val (if minus? (- num) num)
+            (nth-value 0 (floor val 10)))
        (pos (1- len) (1- pos))
        (mod (mod val 10) (mod val 10)))
       ((or (zerop val) (minusp pos))
@@ -289,11 +290,13 @@ Leading zeros are present."
   "Outputs a string of LEN digit with an optional initial character PCHAR.
 Leading zeros are present."
   (declare (optimize (speed 3) (safety 0) (space 0))
-          (type fixnum len) (type integer num))
+          (type fixnum len)
+          (type integer num))
   (do* ((zero-code (char-code #\0))
        (result (make-string len :initial-element #\0))
        (minus? (minusp num))
-       (val (if minus? (- 0 num) num) (floor (/ val 10)))
+       (val (if minus? (- 0 num) num)
+            (nth-value 0 (floor val 10)))
        (pos (1- len) (1- pos))
        (mod (mod val 10) (mod val 10)))
       ((or (zerop val) (minusp pos))
@@ -320,9 +323,9 @@ Leading zeros are present."
 
 (defun string-delimited-string-to-list (str substr)
   "splits a string delimited by substr into a list of strings"
-  #+ignore
   (declare (simple-string str substr)
-          (optimize (speed 3) (safety 0) (space 0) (compilation-speed 0)))
+          (optimize (speed 3) (safety 0) (space 0) (compilation-speed 0)
+                    (debug 0)))
   (do* ((substr-len (length substr))
        (strlen (length str))
        (output '())
@@ -352,7 +355,8 @@ Leading zeros are present."
        (when (and i (< i end))
          (push (subseq str i end) results))
        (nreverse results))
-    (declare (fixnum i j end))
+    (declare (fixnum end)
+            (type (or fixnum null) i j))
     (push (subseq str i j) results)))
 
 (defun string-starts-with (start str)
@@ -376,6 +380,7 @@ Leading zeros are present."
   "Return a count of the number of times a predicate is true
 for characters in a string"
   (declare (simple-string s)
+          (type (or function symbol) pred)
           (optimize (speed 3) (safety 0) (space 0)))
   (do ((len (length s))
        (i 0 (1+ i))

diff --git a/web-utils.lisp b/web-utils.lisp
index 64f98176b3a286db11dcf8ca9b03a9b72cae3aa3..2f0c3a51ae4fdabf66b2e6342c1f4001e9d9fdf5 100644 (file)
--- a/web-utils.lisp
+++ b/web-utils.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: web-utils.lisp,v 1.15 2003/06/17 04:56:02 kevin Exp $
+;;;; $Id: web-utils.lisp,v 1.16 2003/06/17 06:18:09 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -89,7 +89,7 @@
   (declare (simple-string s)
           (optimize (speed 3) (safety 0) (space 0)))
   (do* ((old-len (length s))
-       (new-len (- old-len (* 2 (count-string-char s #\%))))
+       (new-len (- old-len (* 2 (the fixnum (count-string-char s #\%)))))
        (new (make-string new-len))
        (p-old 0)
        (p-new 0 (1+ p-new)))