thread opts through unpack

Author: edma2

src/msgpack/core.clj

@@ -262,11 +262,11 @@
  (refine-ext
  (->Ext (.readByte data-input) (read-bytes n data-input))))
 
-(defn- unpack-n [n ^java.io.DataInput data-input]
- (doall (for [_ (range n)] (unpack-stream data-input))))
+(defn- unpack-n [n ^java.io.DataInput data-input opts]
+ (doall (for [_ (range n)] (unpack-stream data-input opts))))
 
-(defn- unpack-map [n ^java.io.DataInput data-input]
- (apply hash-map (unpack-n (* 2 n) data-input)))
+(defn- unpack-map [n ^java.io.DataInput data-input opts]
+ (apply hash-map (unpack-n (* 2 n) data-input opts)))
 
 (defn unpack-stream
  ([^java.io.DataInput data-input] (unpack-stream data-input nil))
@@ -341,23 +341,23 @@
 
  ; array format family
  (= (bit-and 2r11110000 byte) 2r10010000)
- (unpack-n (bit-and 2r1111 byte) data-input)
+ (unpack-n (bit-and 2r1111 byte) data-input opts)
 
  (= byte 0xdc)
- (unpack-n (read-uint16 data-input) data-input)
+ (unpack-n (read-uint16 data-input) data-input opts)
 
  (= byte 0xdd)
- (unpack-n (read-uint32 data-input) data-input)
+ (unpack-n (read-uint32 data-input) data-input opts)
 
  ; map format family
  (= (bit-and 2r11110000 byte) 2r10000000)
- (unpack-map (bit-and 2r1111 byte) data-input)
+ (unpack-map (bit-and 2r1111 byte) data-input opts)
 
  (= byte 0xde)
- (unpack-map (read-uint16 data-input) data-input)
+ (unpack-map (read-uint16 data-input) data-input opts)
 
  (= byte 0xdf)
- (unpack-map (read-uint32 data-input) data-input))))
+ (unpack-map (read-uint32 data-input) data-input opts))))
 
 (defn- to-byte-array
  [bytes]

test/msgpack/core_test.clj

@@ -152,7 +152,7 @@
  (round-trip (unsigned-byte-array (repeat 255 0x80)) (concat [0xc4 0xff] (repeat 255 0x80))))
  (testing "bin 16"
  (round-trip (unsigned-byte-array (repeat 256 0x80)) (concat [0xc5 0x01 0x00] (repeat 256 0x80)))
- (round-trip-raw 
+ (round-trip-raw
  (unsigned-byte-array (repeat 256 0x80))
  (concat [0xda 0x01 0x00] (repeat 256 0x80))
  (unsigned-byte-array (repeat 256 0x80))))
@@ -203,7 +203,8 @@
  (round-trip '() [0x90])
  (round-trip [] [0x90])
  (round-trip [[]] [0x91 0x90])
- (round-trip [5 "abc", true] [0x93 0x05 0xa3 0x61 0x62 0x63 0xc3])
+ (round-trip [5 "abc" true] [0x93 0x05 0xa3 0x61 0x62 0x63 0xc3])
+ (round-trip-raw [5 "abc" true] [0x93 0x05 0xa3 0x61 0x62 0x63 0xc3] [5 (.getBytes "abc") true])
  (round-trip [true 1 (msg/->Ext 100 (.getBytes "foo")) 0xff {1 false 2 "abc"} (unsigned-byte-array [0x80]) [1 2 3] "abc"]
  [0x98 0xc3 0x1 0xc7 0x3 0x64 0x66 0x6f 0x6f 0xcc 0xff 0x82 0x1 0xc2 0x2 0xa3 0x61 0x62 0x63 0xc4 0x1 0x80 0x93 0x1 0x2 0x3 0xa3 0x61 0x62 0x63]))
  (testing "array 16"
@@ -217,6 +218,9 @@
 (deftest map-test
  (testing "fixmap"
  (round-trip {} [0x80])
+ (round-trip-raw {(byte-array 0) [{"key" (byte-array 0)}]} 
+ [0x81 0xa0 0x91 0x81 0xa3 0x6b 0x65 0x79 0xa0] 
+ {nil [{(.getBytes "key") nil}]})
  (round-trip {1 true 2 "abc" 3 (unsigned-byte-array [0x80])}
  [0x83 0x01 0xc3 0x02 0xa3 0x61 0x62 0x63 0x03 0xc4 0x01 0x80])
  (round-trip {"abc" 5} [0x81 0xa3 0x61 0x62 0x63 0x05])