Changeset 2743

Timestamp:

03/16/08 21:50:29 (10 months ago)

Author:

hans

Message:

Support ratios in datastore.

Files:

• trunk/bknr/datastore/src/data/encoding-test.lisp (modified) (1 diff)
• trunk/bknr/datastore/src/data/encoding.lisp (modified) (4 diffs)

trunk/bknr/datastore/src/data/encoding-test.lisp

@@ -62 +62 @@
-(test-encoding integer.6 most-negative-fixnum)
-
- - currently no supported
-;; 
-;; 
-;; 
-;; 
-;; 
+
+
+
+
+
+
-
-;; complex numbers - currently not supported

trunk/bknr/datastore/src/data/encoding.lisp

@@ -145 +145 @@
-        do (write-byte (ldb (byte 8 i) object) stream))))
-
+(defun %encode-rational (object stream)
+  (%encode-integer (numerator object) stream)
+  (%encode-integer (denominator object) stream))
+
-(defun encode-integer (object stream)
-  (%write-char #\i stream)
-  (%encode-integer object stream))
+
+(defun encode-rational (object stream)
+  (%write-char #\r stream)
+  (%encode-rational object stream))
-
-(defun count-conses (list)
@@ -268 +276 @@
-  (typecase object
-    (integer (encode-integer object stream))
+    (rational (encode-rational object stream))
-    (symbol (encode-symbol object stream))
-    (character (encode-char object stream))
@@ -307 +316 @@
-    (assert (plusp n))                  ;n==0 geben wir nicht aus
-    (%decode-integer/fixed stream n)))
+
+(defun %decode-rational (stream)
+  (/ (%decode-integer stream)
+     (%decode-integer stream)))
-
-(defun %decode-char (stream)
@@ -412 +425 @@
-      (#\f (%decode-single-float stream))
-      (#\d (%decode-double-float stream))
+      (#\r (%decode-rational stream))
-      (t (decode-object tag stream)))))
-