Update of /project/cl-store/cvsroot/cl-store In directory common-lisp.net:/tmp/cvs-serv15747

Modified Files: circularities.lisp cl-store.asd default-backend.lisp plumbing.lisp tests.lisp utils.lisp Log Message: Changelog 2005-02-18 Date: Fri Feb 18 12:11:00 2005 Author: sross

Index: cl-store/circularities.lisp diff -u cl-store/circularities.lisp:1.15 cl-store/circularities.lisp:1.16 --- cl-store/circularities.lisp:1.15 Fri Feb 11 13:00:31 2005 +++ cl-store/circularities.lisp Fri Feb 18 12:10:59 2005 @@ -19,6 +19,7 @@ ;; programs according to the Hyperspec(notes in EQ).

(in-package :cl-store) +(declaim (optimize speed (debug 0) (safety 1)))

(defvar *check-for-circs* t)

@@ -30,7 +31,7 @@

(defun force (delay) (unless (delay-completed delay) - (setf (delay-value delay) (funcall (delay-value delay)) + (setf (delay-value delay) (funcall (the function (delay-value delay))) (delay-completed delay) t)) (delay-value delay))

Index: cl-store/cl-store.asd diff -u cl-store/cl-store.asd:1.23 cl-store/cl-store.asd:1.24 --- cl-store/cl-store.asd:1.23 Fri Feb 18 09:20:10 2005 +++ cl-store/cl-store.asd Fri Feb 18 12:11:00 2005 @@ -40,7 +40,7 @@ :name "CL-STORE" :author "Sean Ross sdr@jhb.ucs.co.za" :maintainer "Sean Ross sdr@jhb.ucs.co.za" - :version "0.4.18" + :version "0.5" :description "Serialization package" :long-description "Portable CL Package to serialize data types" :licence "MIT"

Index: cl-store/default-backend.lisp diff -u cl-store/default-backend.lisp:1.22 cl-store/default-backend.lisp:1.23 --- cl-store/default-backend.lisp:1.22 Fri Feb 18 09:15:49 2005 +++ cl-store/default-backend.lisp Fri Feb 18 12:11:00 2005 @@ -4,6 +4,8 @@ ;; The cl-store backend. (in-package :cl-store)

+(declaim (optimize speed (debug 0) (safety 1))) + (defbackend cl-store :magic-number 1349740876 :stream-type '(unsigned-byte 8) :old-magic-numbers (1912923 1886611788 1347635532 1886611820 @@ -183,7 +185,7 @@ (store-object sign stream)))))

(defrestore-cl-store (float stream) - (float (* (get-float-type (read-byte stream)) + (float (* (the float (get-float-type (read-byte stream))) (* (the integer (restore-object stream)) (expt (the integer (restore-object stream)) (the integer (restore-object stream)))) @@ -545,6 +547,7 @@ (store-object (external-symbols obj) stream))

(defun remove-remaining (times stream) + (declare (type fixnum times)) (dotimes (x times) (restore-object stream)))

Index: cl-store/plumbing.lisp diff -u cl-store/plumbing.lisp:1.11 cl-store/plumbing.lisp:1.12 --- cl-store/plumbing.lisp:1.11 Wed Feb 16 13:40:24 2005 +++ cl-store/plumbing.lisp Fri Feb 18 12:11:00 2005 @@ -6,6 +6,8 @@

(in-package :cl-store)

+(declaim (optimize speed (debug 0) (safety 1))) + (defvar *store-used-packages* nil "If non-nil will serialize each used package otherwise will only store the package name")

Index: cl-store/tests.lisp diff -u cl-store/tests.lisp:1.15 cl-store/tests.lisp:1.16 --- cl-store/tests.lisp:1.15 Wed Feb 16 13:40:24 2005 +++ cl-store/tests.lisp Fri Feb 18 12:11:00 2005 @@ -502,8 +502,7 @@

(deftestit gfunction.1 #'cl-store:restore) (deftestit gfunction.2 #'cl-store:store) -#-(or clisp openmcl) -(deftestit gfunction.3 #'(setf cl-store:restore)) +

(deftest nocirc.1 (let* ((string "FOO")

Index: cl-store/utils.lisp diff -u cl-store/utils.lisp:1.13 cl-store/utils.lisp:1.14 --- cl-store/utils.lisp:1.13 Fri Feb 18 09:15:49 2005 +++ cl-store/utils.lisp Fri Feb 18 12:11:00 2005 @@ -92,7 +92,8 @@

(defun store-32-bit (obj stream) "Write OBJ down STREAM as a 32 bit integer." - (declare (optimize speed)) + (declare (optimize speed (debug 0) (safety 1)) + (type sb32 obj)) (let ((obj (logand #XFFFFFFFF obj))) (write-byte (ldb (byte 8 0) obj) stream) (write-byte (ldb (byte 8 8) obj) stream) @@ -104,7 +105,7 @@

(defun read-32-bit (buf &optional (signed t)) "Read a signed or unsigned byte off STREAM." - (declare (optimize speed)) + (declare (optimize speed (debug 0) (safety 1))) (let ((byte1 (read-byte buf)) (byte2 (read-byte buf)) (byte3 (read-byte buf))