added new BSON default binary subtype; fixed 0x02 binary subtype handling

diff --git a/extra/bson/constants/constants.factor b/extra/bson/constants/constants.factor
index e4bf14432a14a79c6113e89f1027d96427e038a6..b2b260615f1ef5ee856cdd3dd17726bc2ca7823e 100644 (file)
--- a/extra/bson/constants/constants.factor
+++ b/extra/bson/constants/constants.factor
@@ -79,9 +79,10 @@ CONSTANT: T_Integer64 HEX: 12
 CONSTANT: T_MinKey  HEX: FF
 CONSTANT: T_MaxKey  HEX: 7F
 
-CONSTANT: T_Binary_Function     HEX: 1
-CONSTANT: T_Binary_Bytes        HEX: 2
-CONSTANT: T_Binary_UUID         HEX: 3
-CONSTANT: T_Binary_MD5          HEX: 5
-CONSTANT: T_Binary_Custom       HEX: 80
+CONSTANT: T_Binary_Default                  HEX: 0
+CONSTANT: T_Binary_Function                 HEX: 1
+CONSTANT: T_Binary_Bytes_Deprecated         HEX: 2
+CONSTANT: T_Binary_UUID                     HEX: 3
+CONSTANT: T_Binary_MD5                      HEX: 5
+CONSTANT: T_Binary_Custom                   HEX: 80
 

diff --git a/extra/bson/reader/reader.factor b/extra/bson/reader/reader.factor
index 852f46f951fc750d27a074830936377def6bdb11..a007431e4a595ffbf196170c2771274a1a5b71d9 100644 (file)
--- a/extra/bson/reader/reader.factor
+++ b/extra/bson/reader/reader.factor
@@ -54,7 +54,8 @@ DEFER: read-elements
 : bson-binary-read ( -- binary )
    read-int32 read-byte 
    {
-        { T_Binary_Bytes [ read ] }
+        { T_Binary_Default [ read ] }
+        { T_Binary_Bytes_Deprecated [ drop read-int32 read ] }
         { T_Binary_Custom [ read bytes>object ] }
         { T_Binary_Function [ read ] }
         [ drop read >string ]

diff --git a/extra/bson/writer/writer.factor b/extra/bson/writer/writer.factor
index 0c494c98488baf29d08f17bc4508f91ba973fbee..c7114516343b2061729c088830bdc7c80a91c038 100644 (file)
--- a/extra/bson/writer/writer.factor
+++ b/extra/bson/writer/writer.factor
@@ -56,7 +56,7 @@ DEFER: write-pair
 
 TYPED: write-byte-array ( binary: byte-array -- )
     [ length write-int32 ]
-    [ T_Binary_Bytes write1 write ] bi ; inline
+    [ T_Binary_Default write1 write ] bi ; inline
 
 TYPED: write-mdbregexp ( regexp: mdbregexp -- )
    [ regexp>> write-cstring ]