r3769: Auto commit for Debian build

diff --git a/debian/changelog b/debian/changelog
index b25f4f094d18b76d7de189b0c5decffa2805830b..83f78ca416fb7440cd9c5b0e6cc296c5cbd89b80 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cl-base64 (3.0.1-2) unstable; urgency=low
+
+  * Change declarations from array to simple-array where feasible
+  * add more fixnum declarations where helpful
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Tue, 14 Jan 2003 04:55:48 -0700
+
 cl-base64 (3.0.1-1) unstable; urgency=low
 
   * Fix output of base64-string-to-usb8-array

diff --git a/decode.lisp b/decode.lisp
index d1e9ed3be1d4c5583ab0291f92119640dc2e0203..fe47871205486e69e821689baf23443d25edfc08 100644 (file)
--- a/decode.lisp
+++ b/decode.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Dec 2002
 ;;;;
-;;;; $Id: decode.lisp,v 1.3 2003/01/14 11:43:10 kevin Exp $
+;;;; $Id: decode.lisp,v 1.4 2003/01/14 11:59:44 kevin Exp $
 ;;;;
 ;;;; This file implements the Base64 transfer encoding algorithm as
 ;;;; defined in RFC 1521 by Borensten & Freed, September 1993.
@@ -61,7 +61,7 @@
                          (:string
                           '((simple-string result)))
                          (:usb8-array
-                          '((type (array (usigned-byte 8) (*)) result))))
+                          '((type (simple-array (usigned-byte 8) (*)) result))))
                  (fixnum ridx))
         (do* ((bitstore 0)
               (bitcount 0)
@@ -146,7 +146,7 @@
                          (:string
                           '((simple-string result)))
                          (:usb8-array
-                          '((type (array (unsigned-byte 8) (*)) result))))
+                          '((type (simple-array (unsigned-byte 8) (*)) result))))
                  (fixnum ridx))
         (loop 
            for char of-type character across input

diff --git a/encode.lisp b/encode.lisp
index 4bca7a3d352ab7cc2f077dc21dd2d61dad84fd07..f3791aad7867651a608f65fb96a2280f7bdc1dce 100644 (file)
--- a/encode.lisp
+++ b/encode.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Dec 2002
 ;;;;
-;;;; $Id: encode.lisp,v 1.4 2003/01/14 11:43:10 kevin Exp $
+;;;; $Id: encode.lisp,v 1.5 2003/01/14 11:59:44 kevin Exp $
 ;;;;
 ;;;; This file implements the Base64 transfer encoding algorithm as
 ;;;; defined in RFC 1521 by Borensten & Freed, September 1993.
@@ -28,7 +28,7 @@
 ;;;;   - Renamed functions now that supporting integer conversions
 ;;;;   - URI-compatible encoding using :uri key
 ;;;;
-;;;; $Id: encode.lisp,v 1.4 2003/01/14 11:43:10 kevin Exp $
+;;;; $Id: encode.lisp,v 1.5 2003/01/14 11:59:44 kevin Exp $
 
 (in-package #:cl-base64)
 
@@ -81,7 +81,7 @@ with a #\Newline."
                        (ioutput 0)))
              (col (if (plusp columns)
                       0
-                      (1+ padded-length))))
+                      (the fixnum (1+ padded-length)))))
         (declare (fixnum string-length padded-length col
                          ,@(when (eq output-type :string)
                                  '(ioutput)))
@@ -129,8 +129,8 @@ with a #\Newline."
                               (the fixnum
                                 (logand #x3f svalue))))
                       (output-char pad))))
-       (do ((igroup 0 (1+ igroup))
-            (isource 0 (+ isource 3)))
+       (do ((igroup 0 (the fixnum (1+ igroup)))
+            (isource 0 (the fixnum (+ isource 3))))
            ((= igroup complete-group-count)
             (cond
               ((= remainder 2)
@@ -149,9 +149,11 @@ with a #\Newline."
                        (ash
                         ,(case input-type
                                (:string
-                                '(char-code (the character (char input (1+ isource)))))
+                                '(char-code (the character (char input
+                                                                 (the fixnum (1+ isource))))))
                                (:usb8-array
-                                '(the fixnum (aref input (1+ isource)))))
+                                '(the fixnum (aref input (the fixnum
+                                                           (1+ isource))))))
                         8))))
                 3))
               ((= remainder 1)
@@ -188,14 +190,16 @@ with a #\Newline."
                 (the fixnum
                   ,(case input-type
                          (:string
-                          '(char-code (the character (char input (1+ isource)))))
+                          '(char-code (the character (char input
+                                                           (the fixnum (1+ isource))))))
                        (:usb8-array
                         '(aref input (1+ isource)))))
                 8))
              (the fixnum
                ,(case input-type
                       (:string
-                       '(char-code (the character (char input (+ 2 isource)))))
+                       '(char-code (the character (char input
+                                                        (the fixnum (+ 2 isource))))))
                       (:usb8-array
                        '(aref input (+ 2 isource))))
                )))
@@ -289,9 +293,10 @@ with a #\Newline."
           (last-nonpad-char (1- nonpad-chars))
           (str (make-string strlen)))
       (declare (fixnum padded-length last-nonpad-char))
-      (do* ((strpos 0 (1+ strpos))
+      (do* ((strpos 0 (the fixnum (1+ strpos)))
            (int (ash input (/ padding-bits 3)) (ash int -6))
-           (6bit-value (logand int #x3f) (logand int #x3f)))
+           (6bit-value (the fixnum (logand int #x3f))
+                       (the fixnum (logand int #x3f))))
           ((= strpos nonpad-chars)
            (let ((col 0))
              (declare (fixnum col))

diff --git a/package.lisp b/package.lisp
index 014cd1f58da3765554f0d8ba2c3af19d88685299..71f6405cae780b8ca508db2a6e042ef19f485f90 100644 (file)
--- a/package.lisp
+++ b/package.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Dec 2002
 ;;;;
-;;;; $Id: package.lisp,v 1.2 2003/01/12 22:32:40 kevin Exp $
+;;;; $Id: package.lisp,v 1.3 2003/01/14 11:59:44 kevin Exp $
 ;;;;
 ;;;; *************************************************************************
 
@@ -50,7 +50,7 @@
   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_")
 (declaim (type simple-string *uri-encode-table*))
 
-(deftype decode-table () '(array fixnum (256)))
+(deftype decode-table () '(simple-array fixnum (256)))
 
 (defun make-decode-table (encode-table)
   (let ((dt (make-array 256 :adjustable nil :fill-pointer nil