---

yaml
---
r: 188004
b: refs/heads/master
c: 7b6e43c
h: refs/heads/master
v: v3

Author: lifthrasiir

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 84e9a61e9c697ffb6f6f783e9190d5a93dfdc10a
+refs/heads/master: 7b6e43c07f18243873d7cff428cca8cf8283467b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 3a96d6a9818fe2affc98a187fb1065120458cee9
 refs/heads/try: 3cfe2f4e4f6207f53d4e2e7201b7b2aeff802d84

trunk/src/librbml/lib.rs

@@ -64,6 +64,10 @@ impl<'doc> Doc<'doc> {
         reader::get_doc(*self, tag)
     }
 
+    pub fn is_empty(&self) -> bool {
+        self.start == self.end
+    }
+
     pub fn as_str_slice<'a>(&'a self) -> &'a str {
         str::from_utf8(&self.data[self.start..self.end]).unwrap()
     }
@@ -462,6 +466,11 @@ pub mod reader {
         }
 
         fn _next_sub(&mut self) -> DecodeResult<uint> {
+            // empty vector/map optimization
+            if self.parent.is_empty() {
+                return Ok(0);
+            }
+
             let (big, doc) = try!(self.next_doc2(EsSub8, EsSub32));
             let r = if big {
                 doc_as_u32(doc) as uint
@@ -1148,6 +1157,10 @@ pub mod writer {
         fn emit_seq<F>(&mut self, len: uint, f: F) -> EncodeResult where
             F: FnOnce(&mut Encoder<'a>) -> EncodeResult,
         {
+            if len == 0 {
+                // empty vector optimization
+                return self.wr_tagged_bytes(EsVec as uint, &[]);
+            }
 
             try!(self.start_tag(EsVec as uint));
             try!(self._emit_tagged_sub(len));
@@ -1167,6 +1180,10 @@ pub mod writer {
         fn emit_map<F>(&mut self, len: uint, f: F) -> EncodeResult where
             F: FnOnce(&mut Encoder<'a>) -> EncodeResult,
         {
+            if len == 0 {
+                // empty map optimization
+                return self.wr_tagged_bytes(EsMap as uint, &[]);
+            }
 
             try!(self.start_tag(EsMap as uint));
             try!(self._emit_tagged_sub(len));