From: Kevin M. Rosenberg Date: Thu, 12 Jun 2003 14:05:11 +0000 (+0000) Subject: r5109: Auto commit for Debian build X-Git-Tag: v3.3.2~20 X-Git-Url: http://git.kpe.io/?p=cl-base64.git;a=commitdiff_plain;h=e34a016ebf2a676a297b5587cdd7e1029dbc1daf r5109: Auto commit for Debian build --- diff --git a/base64-tests.lisp b/base64-tests.lisp index 26004f4..d1589aa 100644 --- a/base64-tests.lisp +++ b/base64-tests.lisp @@ -7,12 +7,13 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Jan 2003 ;;;; -;;;; $Id: base64-tests.lisp,v 1.13 2003/05/06 16:19:51 kevin Exp $ +;;;; $Id: base64-tests.lisp,v 1.14 2003/06/12 14:05:11 kevin Exp $ ;;;; ************************************************************************* -(in-package :cl-user) - -(defpackage #:base64-test (:use #:cl #:kmrcl #:base64)) +(in-package #:cl-user) +(defpackage #:base64-test + (:use #:cl #:kmrcl #:base64) + (:export #:test-base64)) (in-package #:base64-test) (defun test-base64 () @@ -71,5 +72,4 @@ #+allegro (time-iterations n (excl:usb8-array-to-base64-string usb8)))) -(export 'test-base64) ;;(test-base64) diff --git a/base64.asd b/base64.asd index 1c949b6..ce2ad44 100644 --- a/base64.asd +++ b/base64.asd @@ -7,14 +7,15 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Dec 2002 ;;;; -;;;; $Id: base64.asd,v 1.20 2003/05/06 16:19:51 kevin Exp $ +;;;; $Id: base64.asd,v 1.21 2003/06/12 14:05:11 kevin Exp $ ;;;; ************************************************************************* -(cl:defpackage #:base64-system (:use #:asdf #:cl)) -(cl:in-package #:base64-system) +(in-package #:cl-user) +(defpackage #:base64-system (:use #:asdf #:cl)) +(in-package #:base64-system) -(defsystem :base64 +(defsystem base64 :name "cl-base64" :author "Kevin M. Rosenberg based on initial code by Juri Pakaste" :version "3.1" @@ -32,6 +33,7 @@ (:file "base64-tests" :depends-on ("encode" "decode")) )) -(defmethod perform ((o test-op) (c (eql (find-system :base64)))) - (or (funcall (intern (symbol-name '#:test-base64) (find-package 'base64-test))) +(defmethod perform ((o test-op) (c (eql (find-system 'base64)))) + (or (funcall (intern (symbol-name '#:test-base64) + (find-package 'base64-test))) (error "test-op failed"))) diff --git a/debian/changelog b/debian/changelog index d062b5c..64c40a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-base64 (3.2.1-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg Thu, 12 Jun 2003 08:04:55 -0600 + cl-base64 (3.2-1) unstable; urgency=low * Improve .asd file diff --git a/decode.lisp b/decode.lisp index 3b61804..beeba5c 100644 --- a/decode.lisp +++ b/decode.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Dec 2002 ;;;; -;;;; $Id: decode.lisp,v 1.5 2003/05/06 16:21:06 kevin Exp $ +;;;; $Id: decode.lisp,v 1.6 2003/06/12 14:05:11 kevin Exp $ ;;;; ;;;; This file implements the Base64 transfer encoding algorithm as ;;;; defined in RFC 1521 by Borensten & Freed, September 1993. @@ -21,10 +21,6 @@ (in-package #:cl-base64) -(eval-when (:compile-toplevel) - (declaim (optimize (space 0) (speed 3) (safety 1) (compilation-speed 0)))) - - (declaim (inline whitespace-p)) (defun whitespace-p (c) "Returns T for a whitespace character." @@ -39,13 +35,13 @@ (defmacro def-base64-stream-to-* (output-type) `(defun ,(intern (concatenate 'string (symbol-name :base64-stream-to-) (symbol-name output-type))) - (input &key (uri nil) + (input &key (uri nil) ,@(when (eq output-type :stream) '(stream))) ,(concatenate 'string "Decode base64 stream to " (string-downcase (symbol-name output-type))) (declare (stream input) - (optimize (speed 3))) + (optimize (speed 3) (space 0) (safety 0))) (let ((pad (if uri *uri-pad-char* *pad-char*)) (decode-table (if uri *uri-decode-table* *decode-table*))) (declare (type decode-table decode-table) @@ -124,13 +120,13 @@ (defmacro def-base64-string-to-* (output-type) `(defun ,(intern (concatenate 'string (symbol-name :base64-string-to-) (symbol-name output-type))) - (input &key (uri nil) + (input &key (uri nil) ,@(when (eq output-type :stream) '(stream))) ,(concatenate 'string "Decode base64 string to " (string-downcase (symbol-name output-type))) (declare (string input) - (optimize (speed 3))) + (optimize (speed 3) (safety 0) (space 0))) (let ((pad (if uri *uri-pad-char* *pad-char*)) (decode-table (if uri *uri-decode-table* *decode-table*))) (declare (type decode-table decode-table) @@ -207,7 +203,7 @@ (defun base64-string-to-integer (string &key (uri nil)) "Decodes a base64 string to an integer" (declare (string string) - (optimize (speed 3))) + (optimize (speed 3) (safety 0) (space 0))) (let ((pad (if uri *uri-pad-char* *pad-char*)) (decode-table (if uri *uri-decode-table* *decode-table*))) (declare (type decode-table decode-table) @@ -235,7 +231,7 @@ (defun base64-stream-to-integer (stream &key (uri nil)) "Decodes a base64 string to an integer" (declare (stream stream) - (optimize (speed 3))) + (optimize (speed 3) (space 0) (safety 0))) (let ((pad (if uri *uri-pad-char* *pad-char*)) (decode-table (if uri *uri-decode-table* *decode-table*))) (declare (type decode-table decode-table) diff --git a/encode.lisp b/encode.lisp index 0665ac9..d7c918a 100644 --- a/encode.lisp +++ b/encode.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Dec 2002 ;;;; -;;;; $Id: encode.lisp,v 1.6 2003/05/06 16:21:06 kevin Exp $ +;;;; $Id: encode.lisp,v 1.7 2003/06/12 14:05:11 kevin Exp $ ;;;; ;;;; This file implements the Base64 transfer encoding algorithm as ;;;; defined in RFC 1521 by Borensten & Freed, September 1993. @@ -26,18 +26,14 @@ ;;;; - Renamed functions now that supporting integer conversions ;;;; - URI-compatible encoding using :uri key ;;;; -;;;; $Id: encode.lisp,v 1.6 2003/05/06 16:21:06 kevin Exp $ +;;;; $Id: encode.lisp,v 1.7 2003/06/12 14:05:11 kevin Exp $ (in-package #:cl-base64) -(eval-when (:compile-toplevel) - (declaim (optimize (space 0) (speed 3) (safety 1) (compilation-speed 0)))) - - (defun round-next-multiple (x n) "Round x up to the next highest multiple of n." (declare (fixnum n) - (optimize (speed 3))) + (optimize (speed 3) (safety 0) (space 0))) (let ((remainder (mod x n))) (declare (fixnum remainder)) (if (zerop remainder) @@ -48,7 +44,7 @@ `(defun ,(intern (concatenate 'string (symbol-name input-type) (symbol-name :-to-base64-) (symbol-name output-type))) - (input + (input ,@(when (eq output-type :stream) '(output)) &key (uri nil) (columns 0)) @@ -61,7 +57,7 @@ with a #\Newline." (:usb8-array '((type (array (unsigned-byte 8) (*)) input)))) (fixnum columns) - (optimize (speed 3))) + (optimize (speed 3) (safety 0) (space 0))) (let ((pad (if uri *uri-pad-char* *pad-char*)) (encode-table (if uri *uri-encode-table* *encode-table*))) (declare (simple-string encode-table) @@ -216,7 +212,7 @@ with a #\Newline." "Encode an integer to base64 format." (declare (integer input) (fixnum columns) - (optimize (speed 3))) + (optimize (speed 3) (space 0) (safety 0))) (let ((pad (if uri *uri-pad-char* *pad-char*)) (encode-table (if uri *uri-encode-table* *encode-table*))) (declare (simple-string encode-table) @@ -275,7 +271,7 @@ with a #\Newline." "Encode an integer to base64 format." (declare (integer input) (fixnum columns) - (optimize (speed 3))) + (optimize (speed 3) (space 0) (safety 0))) (let ((pad (if uri *uri-pad-char* *pad-char*)) (encode-table (if uri *uri-encode-table* *encode-table*))) (declare (simple-string encode-table) diff --git a/package.lisp b/package.lisp index fca5cd2..e91e80d 100644 --- a/package.lisp +++ b/package.lisp @@ -7,12 +7,10 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Dec 2002 ;;;; -;;;; $Id: package.lisp,v 1.4 2003/04/15 16:05:39 kevin Exp $ +;;;; $Id: package.lisp,v 1.5 2003/06/12 14:05:11 kevin Exp $ ;;;; ;;;; ************************************************************************* -(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) - (defpackage #:cl-base64 (:nicknames #:base64) (:use #:cl) diff --git a/test.lisp b/test.lisp index 21abfab..1518f35 100644 --- a/test.lisp +++ b/test.lisp @@ -7,10 +7,10 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Jan 2003 ;;;; -;;;; $Id: test.lisp,v 1.2 2003/01/13 21:56:04 kevin Exp $ +;;;; $Id: test.lisp,v 1.3 2003/06/12 14:05:11 kevin Exp $ ;;;; ************************************************************************* -(in-package :cl-user) +(in-package #:cl-user) (defpackage #:base64-test (:use #:cl #:kmrcl #:base64 #:util.test))