[elephant-cvs] CVS elephant/src/elephant

[ieslick]

Update of /project/elephant/cvsroot/elephant/src/elephant
In directory clnet:/tmp/cvs-serv25298/src/elephant

Modified Files:
	controller.lisp serializer2.lisp 
Log Message:
0.6.1 Working HEAD is limping again.  All tests pass on Allegro 8.0/Mac OS X

--- /project/elephant/cvsroot/elephant/src/elephant/controller.lisp	2007/01/21 21:20:04	1.20
+++ /project/elephant/cvsroot/elephant/src/elephant/controller.lisp	2007/01/22 16:17:43	1.21
@@ -137,7 +137,7 @@
 ;; COMMON STORE CONTROLLER FUNCTIONALITY
 ;;
 
-(defclass store-controller ()  
+(defclass store-controller ()
   ((spec :type (or pathname string (simple-array character))
 	 :accessor controller-spec
 	 :initarg :spec
--- /project/elephant/cvsroot/elephant/src/elephant/serializer2.lisp	2007/01/21 21:20:04	1.3
+++ /project/elephant/cvsroot/elephant/src/elephant/serializer2.lisp	2007/01/22 16:17:44	1.4
@@ -45,7 +45,7 @@
 
 ;; Constants
 
-(defconstant +fixnum+                1)
+(defconstant +fixnum32+              1)
 (defconstant +fixnum64+              2)
 (defconstant +char+                  3)
 (defconstant +single-float+          4)
@@ -154,15 +154,15 @@
 	   (incf *lisp-obj-id*))
 	 (%serialize (frob)
 	   (etypecase frob
-	     ((integer #.most-negative-fixnum #.most-positive-fixnum)
-	      (buffer-write-byte +fixnum+ bs)
-	      (buffer-write-int frob bs))
-	     (null
-	      (buffer-write-byte +nil+ bs))
 	     (symbol
 	      (serialize-symbol frob bs sc))
 	     (string
 	      (serialize-string frob bs))
+	     ((integer #.most-negative-fixnum #.most-positive-fixnum)
+	      (buffer-write-byte +fixnum32+ bs)
+	      (buffer-write-int frob bs))
+	     (null
+	      (buffer-write-byte +nil+ bs))
 	     (persistent
 	      (buffer-write-byte +persistent+ bs)
 	      (buffer-write-int (oid frob) bs)
@@ -327,7 +327,7 @@
 	   (declare (type foreign-char tag)
 		    (dynamic-extent tag))
 	   (cond
-	     ((= tag +fixnum+) 
+	     ((= tag +fixnum32+) 
 	      (buffer-read-fixnum bs))
 	     ((= tag +nil+) nil)
 	     ((= tag +utf8-string+)