2011-05-12 10:24:54 -05:00
|
|
|
// Simple Extensible Binary Markup Language (ebml) reader and writer on a
|
2011-03-22 15:59:17 -05:00
|
|
|
// cursor model. See the specification here:
|
|
|
|
// http://www.matroska.org/technical/specs/rfc/index.html
|
2012-09-04 13:23:53 -05:00
|
|
|
use core::Option;
|
|
|
|
use option::{Some, None};
|
2011-03-22 15:59:17 -05:00
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
export Doc;
|
2012-02-14 17:21:53 -06:00
|
|
|
export doc_at;
|
|
|
|
export maybe_get_doc;
|
|
|
|
export get_doc;
|
|
|
|
export docs;
|
|
|
|
export tagged_docs;
|
|
|
|
export doc_data;
|
|
|
|
export doc_as_str;
|
|
|
|
export doc_as_u8;
|
|
|
|
export doc_as_u16;
|
|
|
|
export doc_as_u32;
|
|
|
|
export doc_as_u64;
|
|
|
|
export doc_as_i8;
|
|
|
|
export doc_as_i16;
|
|
|
|
export doc_as_i32;
|
|
|
|
export doc_as_i64;
|
2012-08-11 09:08:42 -05:00
|
|
|
export Writer;
|
2012-03-12 12:19:35 -05:00
|
|
|
export serializer;
|
|
|
|
export ebml_deserializer;
|
2012-08-11 09:08:42 -05:00
|
|
|
export EbmlDeserializer;
|
2012-03-12 12:19:35 -05:00
|
|
|
export deserializer;
|
2012-07-03 19:11:39 -05:00
|
|
|
export with_doc_data;
|
2012-07-27 21:32:42 -05:00
|
|
|
export get_doc;
|
|
|
|
export extensions;
|
2012-02-14 17:21:53 -06:00
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
type EbmlTag = {id: uint, size: uint};
|
2011-06-15 13:19:50 -05:00
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
type EbmlState = {ebml_tag: EbmlTag, tag_pos: uint, data_pos: uint};
|
2011-03-22 15:59:17 -05:00
|
|
|
|
2012-07-05 16:17:16 -05:00
|
|
|
// FIXME (#2739): When we have module renaming, make "reader" and "writer"
|
|
|
|
// separate modules within this file.
|
2011-03-22 15:59:17 -05:00
|
|
|
|
2011-05-12 10:24:54 -05:00
|
|
|
// ebml reading
|
2012-08-11 09:08:42 -05:00
|
|
|
type Doc = {data: @~[u8], start: uint, end: uint};
|
2011-07-27 07:19:39 -05:00
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
type TaggedDoc = {tag: uint, doc: Doc};
|
2012-02-10 18:38:33 -06:00
|
|
|
|
2012-09-02 20:13:48 -05:00
|
|
|
impl Doc: ops::Index<uint,Doc> {
|
2012-08-11 09:08:42 -05:00
|
|
|
pure fn index(&&tag: uint) -> Doc {
|
2012-07-27 21:32:42 -05:00
|
|
|
unchecked {
|
|
|
|
get_doc(self, tag)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-06-29 18:26:56 -05:00
|
|
|
fn vuint_at(data: &[u8], start: uint) -> {val: uint, next: uint} {
|
2011-08-19 17:16:48 -05:00
|
|
|
let a = data[start];
|
2012-02-09 04:50:54 -06:00
|
|
|
if a & 0x80u8 != 0u8 {
|
2012-08-01 19:30:05 -05:00
|
|
|
return {val: (a & 0x7fu8) as uint, next: start + 1u};
|
2012-02-09 04:50:54 -06:00
|
|
|
}
|
2011-07-27 07:19:39 -05:00
|
|
|
if a & 0x40u8 != 0u8 {
|
2012-08-01 19:30:05 -05:00
|
|
|
return {val: ((a & 0x3fu8) as uint) << 8u |
|
2012-02-14 17:21:53 -06:00
|
|
|
(data[start + 1u] as uint),
|
2011-07-27 07:19:39 -05:00
|
|
|
next: start + 2u};
|
2011-08-19 17:16:48 -05:00
|
|
|
} else if a & 0x20u8 != 0u8 {
|
2012-08-01 19:30:05 -05:00
|
|
|
return {val: ((a & 0x1fu8) as uint) << 16u |
|
2012-02-14 17:21:53 -06:00
|
|
|
(data[start + 1u] as uint) << 8u |
|
|
|
|
(data[start + 2u] as uint),
|
2011-07-27 07:19:39 -05:00
|
|
|
next: start + 3u};
|
2011-08-19 17:16:48 -05:00
|
|
|
} else if a & 0x10u8 != 0u8 {
|
2012-08-01 19:30:05 -05:00
|
|
|
return {val: ((a & 0x0fu8) as uint) << 24u |
|
2012-02-14 17:21:53 -06:00
|
|
|
(data[start + 1u] as uint) << 16u |
|
|
|
|
(data[start + 2u] as uint) << 8u |
|
|
|
|
(data[start + 3u] as uint),
|
2011-07-27 07:19:39 -05:00
|
|
|
next: start + 4u};
|
2012-08-22 19:24:52 -05:00
|
|
|
} else { error!("vint too big"); fail; }
|
2011-03-22 15:59:17 -05:00
|
|
|
}
|
|
|
|
|
2012-08-29 16:45:25 -05:00
|
|
|
fn Doc(data: @~[u8]) -> Doc {
|
2012-08-01 19:30:05 -05:00
|
|
|
return {data: data, start: 0u, end: vec::len::<u8>(*data)};
|
2011-04-06 19:53:25 -05:00
|
|
|
}
|
2011-03-22 15:59:17 -05:00
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn doc_at(data: @~[u8], start: uint) -> TaggedDoc {
|
2012-02-12 21:02:08 -06:00
|
|
|
let elt_tag = vuint_at(*data, start);
|
|
|
|
let elt_size = vuint_at(*data, elt_tag.next);
|
2011-07-27 07:19:39 -05:00
|
|
|
let end = elt_size.next + elt_size.val;
|
2012-08-01 19:30:05 -05:00
|
|
|
return {tag: elt_tag.val,
|
2012-02-10 18:38:33 -06:00
|
|
|
doc: {data: data, start: elt_size.next, end: end}};
|
2011-03-22 15:59:17 -05:00
|
|
|
}
|
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn maybe_get_doc(d: Doc, tg: uint) -> Option<Doc> {
|
2012-03-14 13:03:56 -05:00
|
|
|
let mut pos = d.start;
|
2011-07-27 07:19:39 -05:00
|
|
|
while pos < d.end {
|
2012-02-12 21:02:08 -06:00
|
|
|
let elt_tag = vuint_at(*d.data, pos);
|
|
|
|
let elt_size = vuint_at(*d.data, elt_tag.next);
|
2011-07-26 07:06:02 -05:00
|
|
|
pos = elt_size.next + elt_size.val;
|
2011-07-27 07:19:39 -05:00
|
|
|
if elt_tag.val == tg {
|
2012-08-11 09:08:42 -05:00
|
|
|
return Some::<Doc>({
|
2012-08-01 19:30:05 -05:00
|
|
|
data: d.data,
|
|
|
|
start: elt_size.next,
|
|
|
|
end: pos
|
|
|
|
});
|
2011-03-25 19:53:46 -05:00
|
|
|
}
|
2011-03-22 15:59:17 -05:00
|
|
|
}
|
2012-08-11 09:08:42 -05:00
|
|
|
return None::<Doc>;
|
2011-03-22 15:59:17 -05:00
|
|
|
}
|
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn get_doc(d: Doc, tg: uint) -> Doc {
|
2012-08-06 14:34:08 -05:00
|
|
|
match maybe_get_doc(d, tg) {
|
2012-08-20 14:23:37 -05:00
|
|
|
Some(d) => return d,
|
|
|
|
None => {
|
2012-08-22 19:24:52 -05:00
|
|
|
error!("failed to find block with tag %u", tg);
|
2011-07-27 07:19:39 -05:00
|
|
|
fail;
|
|
|
|
}
|
2011-04-06 19:53:25 -05:00
|
|
|
}
|
2011-03-22 15:59:17 -05:00
|
|
|
}
|
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn docs(d: Doc, it: fn(uint, Doc) -> bool) {
|
2012-03-14 13:03:56 -05:00
|
|
|
let mut pos = d.start;
|
2011-07-27 07:19:39 -05:00
|
|
|
while pos < d.end {
|
2012-02-12 21:02:08 -06:00
|
|
|
let elt_tag = vuint_at(*d.data, pos);
|
|
|
|
let elt_size = vuint_at(*d.data, elt_tag.next);
|
2011-07-26 07:06:02 -05:00
|
|
|
pos = elt_size.next + elt_size.val;
|
2012-07-26 15:43:27 -05:00
|
|
|
if !it(elt_tag.val, {data: d.data, start: elt_size.next, end: pos}) {
|
|
|
|
break;
|
|
|
|
}
|
2011-03-31 16:37:09 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn tagged_docs(d: Doc, tg: uint, it: fn(Doc) -> bool) {
|
2012-03-14 13:03:56 -05:00
|
|
|
let mut pos = d.start;
|
2011-07-27 07:19:39 -05:00
|
|
|
while pos < d.end {
|
2012-02-12 21:02:08 -06:00
|
|
|
let elt_tag = vuint_at(*d.data, pos);
|
|
|
|
let elt_size = vuint_at(*d.data, elt_tag.next);
|
2011-07-26 07:06:02 -05:00
|
|
|
pos = elt_size.next + elt_size.val;
|
2011-07-27 07:19:39 -05:00
|
|
|
if elt_tag.val == tg {
|
2012-07-26 15:43:27 -05:00
|
|
|
if !it({data: d.data, start: elt_size.next, end: pos}) {
|
|
|
|
break;
|
|
|
|
}
|
2011-04-06 19:53:25 -05:00
|
|
|
}
|
|
|
|
}
|
2011-03-31 16:37:09 -05:00
|
|
|
}
|
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn doc_data(d: Doc) -> ~[u8] { vec::slice::<u8>(*d.data, d.start, d.end) }
|
2011-03-22 15:59:17 -05:00
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn with_doc_data<T>(d: Doc, f: fn(x: &[u8]) -> T) -> T {
|
2012-08-01 19:30:05 -05:00
|
|
|
return f(vec::view(*d.data, d.start, d.end));
|
2012-07-03 19:11:39 -05:00
|
|
|
}
|
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn doc_as_str(d: Doc) -> ~str { return str::from_bytes(doc_data(d)); }
|
2011-03-31 16:37:09 -05:00
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn doc_as_u8(d: Doc) -> u8 {
|
2012-02-12 21:02:08 -06:00
|
|
|
assert d.end == d.start + 1u;
|
2012-08-01 19:30:05 -05:00
|
|
|
return (*d.data)[d.start];
|
2012-02-12 21:02:08 -06:00
|
|
|
}
|
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn doc_as_u16(d: Doc) -> u16 {
|
2012-02-14 17:21:53 -06:00
|
|
|
assert d.end == d.start + 2u;
|
2012-08-01 19:30:05 -05:00
|
|
|
return io::u64_from_be_bytes(*d.data, d.start, 2u) as u16;
|
2012-02-14 17:21:53 -06:00
|
|
|
}
|
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn doc_as_u32(d: Doc) -> u32 {
|
2012-02-14 17:21:53 -06:00
|
|
|
assert d.end == d.start + 4u;
|
2012-08-01 19:30:05 -05:00
|
|
|
return io::u64_from_be_bytes(*d.data, d.start, 4u) as u32;
|
2011-03-22 15:59:17 -05:00
|
|
|
}
|
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn doc_as_u64(d: Doc) -> u64 {
|
2012-02-14 17:21:53 -06:00
|
|
|
assert d.end == d.start + 8u;
|
2012-08-01 19:30:05 -05:00
|
|
|
return io::u64_from_be_bytes(*d.data, d.start, 8u);
|
2012-02-12 21:02:08 -06:00
|
|
|
}
|
2011-03-22 15:59:17 -05:00
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn doc_as_i8(d: Doc) -> i8 { doc_as_u8(d) as i8 }
|
|
|
|
fn doc_as_i16(d: Doc) -> i16 { doc_as_u16(d) as i16 }
|
|
|
|
fn doc_as_i32(d: Doc) -> i32 { doc_as_u32(d) as i32 }
|
|
|
|
fn doc_as_i64(d: Doc) -> i64 { doc_as_u64(d) as i64 }
|
2012-02-14 17:21:53 -06:00
|
|
|
|
2011-06-15 13:19:50 -05:00
|
|
|
// ebml writing
|
2012-08-11 09:08:42 -05:00
|
|
|
type Writer_ = {writer: io::Writer, mut size_positions: ~[uint]};
|
2012-07-11 17:00:40 -05:00
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
enum Writer {
|
|
|
|
Writer_(Writer_)
|
2012-07-11 17:00:40 -05:00
|
|
|
}
|
2011-07-27 07:19:39 -05:00
|
|
|
|
2012-08-14 15:38:35 -05:00
|
|
|
fn write_sized_vuint(w: io::Writer, n: uint, size: uint) {
|
2012-08-06 14:34:08 -05:00
|
|
|
match size {
|
2012-08-03 21:59:04 -05:00
|
|
|
1u => w.write(&[0x80u8 | (n as u8)]),
|
|
|
|
2u => w.write(&[0x40u8 | ((n >> 8_u) as u8), n as u8]),
|
|
|
|
3u => w.write(&[0x20u8 | ((n >> 16_u) as u8), (n >> 8_u) as u8,
|
|
|
|
n as u8]),
|
|
|
|
4u => w.write(&[0x10u8 | ((n >> 24_u) as u8), (n >> 16_u) as u8,
|
|
|
|
(n >> 8_u) as u8, n as u8]),
|
2012-08-22 19:24:52 -05:00
|
|
|
_ => fail fmt!("vint to write too big: %?", n)
|
2012-03-14 13:03:56 -05:00
|
|
|
};
|
2011-03-22 19:28:35 -05:00
|
|
|
}
|
|
|
|
|
2012-08-14 15:38:35 -05:00
|
|
|
fn write_vuint(w: io::Writer, n: uint) {
|
2012-08-01 19:30:05 -05:00
|
|
|
if n < 0x7f_u { write_sized_vuint(w, n, 1u); return; }
|
|
|
|
if n < 0x4000_u { write_sized_vuint(w, n, 2u); return; }
|
|
|
|
if n < 0x200000_u { write_sized_vuint(w, n, 3u); return; }
|
|
|
|
if n < 0x10000000_u { write_sized_vuint(w, n, 4u); return; }
|
2012-08-22 19:24:52 -05:00
|
|
|
fail fmt!("vint to write too big: %?", n);
|
2011-03-22 19:28:35 -05:00
|
|
|
}
|
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn Writer(w: io::Writer) -> Writer {
|
2012-06-29 18:26:56 -05:00
|
|
|
let size_positions: ~[uint] = ~[];
|
2012-08-11 09:08:42 -05:00
|
|
|
return Writer_({writer: w, mut size_positions: size_positions});
|
2011-03-22 19:28:35 -05:00
|
|
|
}
|
|
|
|
|
2012-07-05 16:17:16 -05:00
|
|
|
// FIXME (#2741): Provide a function to write the standard ebml header.
|
2012-08-11 09:08:42 -05:00
|
|
|
impl Writer {
|
2012-02-14 17:21:53 -06:00
|
|
|
fn start_tag(tag_id: uint) {
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!("Start tag %u", tag_id);
|
2012-02-12 21:02:08 -06:00
|
|
|
|
2012-02-14 17:21:53 -06:00
|
|
|
// Write the enum ID:
|
|
|
|
write_vuint(self.writer, tag_id);
|
2011-06-15 13:19:50 -05:00
|
|
|
|
2012-02-14 17:21:53 -06:00
|
|
|
// Write a placeholder four-byte size.
|
2012-06-25 18:22:22 -05:00
|
|
|
vec::push(self.size_positions, self.writer.tell());
|
2012-06-29 18:26:56 -05:00
|
|
|
let zeroes: &[u8] = &[0u8, 0u8, 0u8, 0u8];
|
2012-02-14 17:21:53 -06:00
|
|
|
self.writer.write(zeroes);
|
|
|
|
}
|
2011-03-22 19:28:35 -05:00
|
|
|
|
2012-02-14 17:21:53 -06:00
|
|
|
fn end_tag() {
|
|
|
|
let last_size_pos = vec::pop::<uint>(self.size_positions);
|
|
|
|
let cur_pos = self.writer.tell();
|
2012-08-14 15:38:35 -05:00
|
|
|
self.writer.seek(last_size_pos as int, io::SeekSet);
|
2012-02-14 17:21:53 -06:00
|
|
|
let size = (cur_pos - last_size_pos - 4u);
|
|
|
|
write_sized_vuint(self.writer, size, 4u);
|
2012-08-14 15:38:35 -05:00
|
|
|
self.writer.seek(cur_pos as int, io::SeekSet);
|
2012-02-12 21:02:08 -06:00
|
|
|
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!("End tag (size = %u)", size);
|
2012-02-14 17:21:53 -06:00
|
|
|
}
|
2012-02-06 09:13:14 -06:00
|
|
|
|
|
|
|
fn wr_tag(tag_id: uint, blk: fn()) {
|
2012-02-14 17:21:53 -06:00
|
|
|
self.start_tag(tag_id);
|
2012-02-06 09:13:14 -06:00
|
|
|
blk();
|
2012-02-14 17:21:53 -06:00
|
|
|
self.end_tag();
|
2012-02-06 09:13:14 -06:00
|
|
|
}
|
|
|
|
|
2012-06-29 18:26:56 -05:00
|
|
|
fn wr_tagged_bytes(tag_id: uint, b: &[u8]) {
|
2012-02-14 17:21:53 -06:00
|
|
|
write_vuint(self.writer, tag_id);
|
|
|
|
write_vuint(self.writer, vec::len(b));
|
|
|
|
self.writer.write(b);
|
|
|
|
}
|
|
|
|
|
|
|
|
fn wr_tagged_u64(tag_id: uint, v: u64) {
|
2012-06-30 18:19:07 -05:00
|
|
|
do io::u64_to_be_bytes(v, 8u) |v| {
|
2012-04-25 19:18:06 -05:00
|
|
|
self.wr_tagged_bytes(tag_id, v);
|
|
|
|
}
|
2012-02-14 17:21:53 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
fn wr_tagged_u32(tag_id: uint, v: u32) {
|
2012-06-30 18:19:07 -05:00
|
|
|
do io::u64_to_be_bytes(v as u64, 4u) |v| {
|
2012-04-25 19:18:06 -05:00
|
|
|
self.wr_tagged_bytes(tag_id, v);
|
|
|
|
}
|
2012-02-14 17:21:53 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
fn wr_tagged_u16(tag_id: uint, v: u16) {
|
2012-06-30 18:19:07 -05:00
|
|
|
do io::u64_to_be_bytes(v as u64, 2u) |v| {
|
2012-04-25 19:18:06 -05:00
|
|
|
self.wr_tagged_bytes(tag_id, v);
|
|
|
|
}
|
2012-02-14 17:21:53 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
fn wr_tagged_u8(tag_id: uint, v: u8) {
|
2012-06-29 18:26:56 -05:00
|
|
|
self.wr_tagged_bytes(tag_id, &[v]);
|
2012-02-10 08:01:32 -06:00
|
|
|
}
|
|
|
|
|
2012-02-14 17:21:53 -06:00
|
|
|
fn wr_tagged_i64(tag_id: uint, v: i64) {
|
2012-06-30 18:19:07 -05:00
|
|
|
do io::u64_to_be_bytes(v as u64, 8u) |v| {
|
2012-04-25 19:18:06 -05:00
|
|
|
self.wr_tagged_bytes(tag_id, v);
|
|
|
|
}
|
2012-02-14 17:21:53 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
fn wr_tagged_i32(tag_id: uint, v: i32) {
|
2012-06-30 18:19:07 -05:00
|
|
|
do io::u64_to_be_bytes(v as u64, 4u) |v| {
|
2012-04-25 19:18:06 -05:00
|
|
|
self.wr_tagged_bytes(tag_id, v);
|
|
|
|
}
|
2012-02-14 17:21:53 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
fn wr_tagged_i16(tag_id: uint, v: i16) {
|
2012-06-30 18:19:07 -05:00
|
|
|
do io::u64_to_be_bytes(v as u64, 2u) |v| {
|
2012-04-25 19:18:06 -05:00
|
|
|
self.wr_tagged_bytes(tag_id, v);
|
|
|
|
}
|
2012-02-14 17:21:53 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
fn wr_tagged_i8(tag_id: uint, v: i8) {
|
2012-06-29 18:26:56 -05:00
|
|
|
self.wr_tagged_bytes(tag_id, &[v as u8]);
|
2012-02-14 17:21:53 -06:00
|
|
|
}
|
|
|
|
|
2012-08-22 21:04:32 -05:00
|
|
|
fn wr_tagged_str(tag_id: uint, v: &str) {
|
2012-08-22 20:34:14 -05:00
|
|
|
str::byte_slice(v, |b| self.wr_tagged_bytes(tag_id, b));
|
2012-02-06 09:13:14 -06:00
|
|
|
}
|
|
|
|
|
2012-06-29 18:26:56 -05:00
|
|
|
fn wr_bytes(b: &[u8]) {
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!("Write %u bytes", vec::len(b));
|
2012-02-06 09:13:14 -06:00
|
|
|
self.writer.write(b);
|
|
|
|
}
|
|
|
|
|
2012-07-14 00:57:48 -05:00
|
|
|
fn wr_str(s: ~str) {
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!("Write str: %?", s);
|
2012-08-23 17:44:57 -05:00
|
|
|
self.writer.write(str::to_bytes(s));
|
2012-02-06 09:13:14 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-07-05 16:17:16 -05:00
|
|
|
// FIXME (#2743): optionally perform "relaxations" on end_tag to more
|
|
|
|
// efficiently encode sizes; this is a fixed point iteration
|
2012-03-12 12:19:35 -05:00
|
|
|
|
|
|
|
// Set to true to generate more debugging in EBML serialization.
|
|
|
|
// Totally lame approach.
|
2012-08-27 18:53:37 -05:00
|
|
|
const debug: bool = false;
|
2012-03-12 12:19:35 -05:00
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
enum EbmlSerializerTag {
|
|
|
|
EsUint, EsU64, EsU32, EsU16, EsU8,
|
|
|
|
EsInt, EsI64, EsI32, EsI16, EsI8,
|
|
|
|
EsBool,
|
|
|
|
EsStr,
|
|
|
|
EsF64, EsF32, EsFloat,
|
|
|
|
EsEnum, EsEnumVid, EsEnumBody,
|
|
|
|
EsVec, EsVecLen, EsVecElt,
|
2012-03-12 12:19:35 -05:00
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
EsLabel // Used only when debugging
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
trait SerializerPriv {
|
|
|
|
fn _emit_tagged_uint(t: EbmlSerializerTag, v: uint);
|
2012-08-23 20:25:29 -05:00
|
|
|
fn _emit_label(label: &str);
|
2012-07-11 17:00:40 -05:00
|
|
|
}
|
2012-03-12 12:19:35 -05:00
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
impl ebml::Writer: SerializerPriv {
|
2012-03-12 12:19:35 -05:00
|
|
|
// used internally to emit things like the vector length and so on
|
2012-08-11 09:08:42 -05:00
|
|
|
fn _emit_tagged_uint(t: EbmlSerializerTag, v: uint) {
|
2012-03-12 12:19:35 -05:00
|
|
|
assert v <= 0xFFFF_FFFF_u;
|
|
|
|
self.wr_tagged_u32(t as uint, v as u32);
|
|
|
|
}
|
|
|
|
|
2012-08-23 20:25:29 -05:00
|
|
|
fn _emit_label(label: &str) {
|
2012-03-12 12:19:35 -05:00
|
|
|
// There are various strings that we have access to, such as
|
|
|
|
// the name of a record field, which do not actually appear in
|
|
|
|
// the serialized EBML (normally). This is just for
|
|
|
|
// efficiency. When debugging, though, we can emit such
|
|
|
|
// labels and then they will be checked by deserializer to
|
|
|
|
// try and check failures more quickly.
|
2012-08-11 09:08:42 -05:00
|
|
|
if debug { self.wr_tagged_str(EsLabel as uint, label) }
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
2012-07-11 17:00:40 -05:00
|
|
|
}
|
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
impl ebml::Writer: serialization::serializer {
|
2012-07-11 17:00:40 -05:00
|
|
|
fn emit_nil() {}
|
2012-03-12 12:19:35 -05:00
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn emit_uint(v: uint) { self.wr_tagged_u64(EsUint as uint, v as u64); }
|
|
|
|
fn emit_u64(v: u64) { self.wr_tagged_u64(EsU64 as uint, v); }
|
|
|
|
fn emit_u32(v: u32) { self.wr_tagged_u32(EsU32 as uint, v); }
|
|
|
|
fn emit_u16(v: u16) { self.wr_tagged_u16(EsU16 as uint, v); }
|
|
|
|
fn emit_u8(v: u8) { self.wr_tagged_u8 (EsU8 as uint, v); }
|
2012-03-12 12:19:35 -05:00
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn emit_int(v: int) { self.wr_tagged_i64(EsInt as uint, v as i64); }
|
|
|
|
fn emit_i64(v: i64) { self.wr_tagged_i64(EsI64 as uint, v); }
|
|
|
|
fn emit_i32(v: i32) { self.wr_tagged_i32(EsI32 as uint, v); }
|
|
|
|
fn emit_i16(v: i16) { self.wr_tagged_i16(EsI16 as uint, v); }
|
|
|
|
fn emit_i8(v: i8) { self.wr_tagged_i8 (EsI8 as uint, v); }
|
2012-03-12 12:19:35 -05:00
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn emit_bool(v: bool) { self.wr_tagged_u8(EsBool as uint, v as u8) }
|
2012-03-12 12:19:35 -05:00
|
|
|
|
2012-07-05 16:17:16 -05:00
|
|
|
// FIXME (#2742): implement these
|
2012-07-14 00:57:48 -05:00
|
|
|
fn emit_f64(_v: f64) { fail ~"Unimplemented: serializing an f64"; }
|
|
|
|
fn emit_f32(_v: f32) { fail ~"Unimplemented: serializing an f32"; }
|
|
|
|
fn emit_float(_v: float) { fail ~"Unimplemented: serializing a float"; }
|
2012-03-12 12:19:35 -05:00
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn emit_str(v: &str) { self.wr_tagged_str(EsStr as uint, v) }
|
2012-03-12 12:19:35 -05:00
|
|
|
|
2012-08-23 20:25:29 -05:00
|
|
|
fn emit_enum(name: &str, f: fn()) {
|
2012-03-12 12:19:35 -05:00
|
|
|
self._emit_label(name);
|
2012-08-11 09:08:42 -05:00
|
|
|
self.wr_tag(EsEnum as uint, f)
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
2012-08-23 20:25:29 -05:00
|
|
|
fn emit_enum_variant(_v_name: &str, v_id: uint, _cnt: uint, f: fn()) {
|
2012-08-11 09:08:42 -05:00
|
|
|
self._emit_tagged_uint(EsEnumVid, v_id);
|
|
|
|
self.wr_tag(EsEnumBody as uint, f)
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
|
|
|
fn emit_enum_variant_arg(_idx: uint, f: fn()) { f() }
|
|
|
|
|
|
|
|
fn emit_vec(len: uint, f: fn()) {
|
2012-08-11 09:08:42 -05:00
|
|
|
do self.wr_tag(EsVec as uint) {
|
|
|
|
self._emit_tagged_uint(EsVecLen, len);
|
2012-03-12 12:19:35 -05:00
|
|
|
f()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn emit_vec_elt(_idx: uint, f: fn()) {
|
2012-08-11 09:08:42 -05:00
|
|
|
self.wr_tag(EsVecElt as uint, f)
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
fn emit_box(f: fn()) { f() }
|
|
|
|
fn emit_uniq(f: fn()) { f() }
|
|
|
|
fn emit_rec(f: fn()) { f() }
|
2012-08-23 20:25:29 -05:00
|
|
|
fn emit_rec_field(f_name: &str, _f_idx: uint, f: fn()) {
|
2012-03-12 12:19:35 -05:00
|
|
|
self._emit_label(f_name);
|
|
|
|
f()
|
|
|
|
}
|
|
|
|
fn emit_tup(_sz: uint, f: fn()) { f() }
|
|
|
|
fn emit_tup_elt(_idx: uint, f: fn()) { f() }
|
|
|
|
}
|
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
type EbmlDeserializer_ = {mut parent: ebml::Doc,
|
2012-07-11 17:00:40 -05:00
|
|
|
mut pos: uint};
|
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
enum EbmlDeserializer {
|
|
|
|
EbmlDeserializer_(EbmlDeserializer_)
|
2012-07-11 17:00:40 -05:00
|
|
|
}
|
2012-03-12 12:19:35 -05:00
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn ebml_deserializer(d: ebml::Doc) -> EbmlDeserializer {
|
|
|
|
EbmlDeserializer_({mut parent: d, mut pos: d.start})
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
priv impl EbmlDeserializer {
|
2012-07-14 00:57:48 -05:00
|
|
|
fn _check_label(lbl: ~str) {
|
2012-03-12 12:19:35 -05:00
|
|
|
if self.pos < self.parent.end {
|
|
|
|
let {tag: r_tag, doc: r_doc} =
|
|
|
|
ebml::doc_at(self.parent.data, self.pos);
|
2012-08-11 09:08:42 -05:00
|
|
|
if r_tag == (EsLabel as uint) {
|
2012-03-12 12:19:35 -05:00
|
|
|
self.pos = r_doc.end;
|
|
|
|
let str = ebml::doc_as_str(r_doc);
|
|
|
|
if lbl != str {
|
2012-08-22 19:24:52 -05:00
|
|
|
fail fmt!("Expected label %s but found %s", lbl, str);
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn next_doc(exp_tag: EbmlSerializerTag) -> ebml::Doc {
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!(". next_doc(exp_tag=%?)", exp_tag);
|
2012-03-12 12:19:35 -05:00
|
|
|
if self.pos >= self.parent.end {
|
2012-07-14 00:57:48 -05:00
|
|
|
fail ~"no more documents in current node!";
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
|
|
|
let {tag: r_tag, doc: r_doc} =
|
|
|
|
ebml::doc_at(self.parent.data, self.pos);
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!("self.parent=%?-%? self.pos=%? r_tag=%? r_doc=%?-%?",
|
2012-05-23 19:18:31 -05:00
|
|
|
copy self.parent.start, copy self.parent.end,
|
2012-08-22 19:24:52 -05:00
|
|
|
copy self.pos, r_tag, r_doc.start, r_doc.end);
|
2012-03-12 12:19:35 -05:00
|
|
|
if r_tag != (exp_tag as uint) {
|
2012-08-22 19:24:52 -05:00
|
|
|
fail fmt!("expected EMBL doc with tag %? but found tag %?",
|
|
|
|
exp_tag, r_tag);
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
|
|
|
if r_doc.end > self.parent.end {
|
2012-08-22 19:24:52 -05:00
|
|
|
fail fmt!("invalid EBML, child extends to 0x%x, parent to 0x%x",
|
|
|
|
r_doc.end, self.parent.end);
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
|
|
|
self.pos = r_doc.end;
|
2012-08-01 19:30:05 -05:00
|
|
|
return r_doc;
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn push_doc<T>(d: ebml::Doc, f: fn() -> T) -> T{
|
2012-03-12 12:19:35 -05:00
|
|
|
let old_parent = self.parent;
|
|
|
|
let old_pos = self.pos;
|
|
|
|
self.parent = d;
|
|
|
|
self.pos = d.start;
|
|
|
|
let r = f();
|
|
|
|
self.parent = old_parent;
|
|
|
|
self.pos = old_pos;
|
2012-09-10 19:50:48 -05:00
|
|
|
move r
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn _next_uint(exp_tag: EbmlSerializerTag) -> uint {
|
2012-03-12 12:19:35 -05:00
|
|
|
let r = ebml::doc_as_u32(self.next_doc(exp_tag));
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!("_next_uint exp_tag=%? result=%?", exp_tag, r);
|
2012-08-01 19:30:05 -05:00
|
|
|
return r as uint;
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
2012-07-11 17:00:40 -05:00
|
|
|
}
|
2012-03-12 12:19:35 -05:00
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
impl EbmlDeserializer: serialization::deserializer {
|
2012-03-12 12:19:35 -05:00
|
|
|
fn read_nil() -> () { () }
|
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn read_u64() -> u64 { ebml::doc_as_u64(self.next_doc(EsU64)) }
|
|
|
|
fn read_u32() -> u32 { ebml::doc_as_u32(self.next_doc(EsU32)) }
|
|
|
|
fn read_u16() -> u16 { ebml::doc_as_u16(self.next_doc(EsU16)) }
|
|
|
|
fn read_u8 () -> u8 { ebml::doc_as_u8 (self.next_doc(EsU8 )) }
|
2012-03-12 12:19:35 -05:00
|
|
|
fn read_uint() -> uint {
|
2012-08-11 09:08:42 -05:00
|
|
|
let v = ebml::doc_as_u64(self.next_doc(EsUint));
|
2012-03-12 12:19:35 -05:00
|
|
|
if v > (core::uint::max_value as u64) {
|
2012-08-22 19:24:52 -05:00
|
|
|
fail fmt!("uint %? too large for this architecture", v);
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
2012-08-01 19:30:05 -05:00
|
|
|
return v as uint;
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn read_i64() -> i64 { ebml::doc_as_u64(self.next_doc(EsI64)) as i64 }
|
|
|
|
fn read_i32() -> i32 { ebml::doc_as_u32(self.next_doc(EsI32)) as i32 }
|
|
|
|
fn read_i16() -> i16 { ebml::doc_as_u16(self.next_doc(EsI16)) as i16 }
|
|
|
|
fn read_i8 () -> i8 { ebml::doc_as_u8 (self.next_doc(EsI8 )) as i8 }
|
2012-03-12 12:19:35 -05:00
|
|
|
fn read_int() -> int {
|
2012-08-11 09:08:42 -05:00
|
|
|
let v = ebml::doc_as_u64(self.next_doc(EsInt)) as i64;
|
2012-03-12 12:19:35 -05:00
|
|
|
if v > (int::max_value as i64) || v < (int::min_value as i64) {
|
2012-08-22 19:24:52 -05:00
|
|
|
fail fmt!("int %? out of range for this architecture", v);
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
2012-08-01 19:30:05 -05:00
|
|
|
return v as int;
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn read_bool() -> bool { ebml::doc_as_u8(self.next_doc(EsBool)) as bool }
|
2012-03-12 12:19:35 -05:00
|
|
|
|
2012-07-14 00:57:48 -05:00
|
|
|
fn read_f64() -> f64 { fail ~"read_f64()"; }
|
|
|
|
fn read_f32() -> f32 { fail ~"read_f32()"; }
|
|
|
|
fn read_float() -> float { fail ~"read_float()"; }
|
2012-03-12 12:19:35 -05:00
|
|
|
|
2012-08-11 09:08:42 -05:00
|
|
|
fn read_str() -> ~str { ebml::doc_as_str(self.next_doc(EsStr)) }
|
2012-03-12 12:19:35 -05:00
|
|
|
|
|
|
|
// Compound types:
|
2012-08-22 21:04:32 -05:00
|
|
|
fn read_enum<T>(name: ~str, f: fn() -> T) -> T {
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!("read_enum(%s)", name);
|
2012-03-12 12:19:35 -05:00
|
|
|
self._check_label(name);
|
2012-08-11 09:08:42 -05:00
|
|
|
self.push_doc(self.next_doc(EsEnum), f)
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
|
|
|
|
2012-08-22 21:04:32 -05:00
|
|
|
fn read_enum_variant<T>(f: fn(uint) -> T) -> T {
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!("read_enum_variant()");
|
2012-08-11 09:08:42 -05:00
|
|
|
let idx = self._next_uint(EsEnumVid);
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!(" idx=%u", idx);
|
2012-08-11 09:08:42 -05:00
|
|
|
do self.push_doc(self.next_doc(EsEnumBody)) {
|
2012-03-12 12:19:35 -05:00
|
|
|
f(idx)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-08-22 21:04:32 -05:00
|
|
|
fn read_enum_variant_arg<T>(idx: uint, f: fn() -> T) -> T {
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!("read_enum_variant_arg(idx=%u)", idx);
|
2012-03-12 12:19:35 -05:00
|
|
|
f()
|
|
|
|
}
|
|
|
|
|
2012-08-22 21:04:32 -05:00
|
|
|
fn read_vec<T>(f: fn(uint) -> T) -> T {
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!("read_vec()");
|
2012-08-11 09:08:42 -05:00
|
|
|
do self.push_doc(self.next_doc(EsVec)) {
|
|
|
|
let len = self._next_uint(EsVecLen);
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!(" len=%u", len);
|
2012-03-12 12:19:35 -05:00
|
|
|
f(len)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-08-22 21:04:32 -05:00
|
|
|
fn read_vec_elt<T>(idx: uint, f: fn() -> T) -> T {
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!("read_vec_elt(idx=%u)", idx);
|
2012-08-11 09:08:42 -05:00
|
|
|
self.push_doc(self.next_doc(EsVecElt), f)
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
|
|
|
|
2012-08-22 21:04:32 -05:00
|
|
|
fn read_box<T>(f: fn() -> T) -> T {
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!("read_box()");
|
2012-03-12 12:19:35 -05:00
|
|
|
f()
|
|
|
|
}
|
|
|
|
|
2012-08-22 21:04:32 -05:00
|
|
|
fn read_uniq<T>(f: fn() -> T) -> T {
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!("read_uniq()");
|
2012-03-12 12:19:35 -05:00
|
|
|
f()
|
|
|
|
}
|
|
|
|
|
2012-08-22 21:04:32 -05:00
|
|
|
fn read_rec<T>(f: fn() -> T) -> T {
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!("read_rec()");
|
2012-03-12 12:19:35 -05:00
|
|
|
f()
|
|
|
|
}
|
|
|
|
|
2012-08-22 21:04:32 -05:00
|
|
|
fn read_rec_field<T>(f_name: ~str, f_idx: uint, f: fn() -> T) -> T {
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!("read_rec_field(%s, idx=%u)", f_name, f_idx);
|
2012-03-12 12:19:35 -05:00
|
|
|
self._check_label(f_name);
|
|
|
|
f()
|
|
|
|
}
|
|
|
|
|
2012-08-22 21:04:32 -05:00
|
|
|
fn read_tup<T>(sz: uint, f: fn() -> T) -> T {
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!("read_tup(sz=%u)", sz);
|
2012-03-12 12:19:35 -05:00
|
|
|
f()
|
|
|
|
}
|
|
|
|
|
2012-08-22 21:04:32 -05:00
|
|
|
fn read_tup_elt<T>(idx: uint, f: fn() -> T) -> T {
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!("read_tup_elt(idx=%u)", idx);
|
2012-03-12 12:19:35 -05:00
|
|
|
f()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// ___________________________________________________________________________
|
|
|
|
// Testing
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_option_int() {
|
|
|
|
fn serialize_1<S: serialization::serializer>(s: S, v: int) {
|
|
|
|
s.emit_i64(v as i64);
|
|
|
|
}
|
|
|
|
|
2012-08-20 14:23:37 -05:00
|
|
|
fn serialize_0<S: serialization::serializer>(s: S, v: Option<int>) {
|
2012-07-14 00:57:48 -05:00
|
|
|
do s.emit_enum(~"core::option::t") {
|
2012-08-06 14:34:08 -05:00
|
|
|
match v {
|
2012-08-20 14:23:37 -05:00
|
|
|
None => s.emit_enum_variant(
|
|
|
|
~"core::option::None", 0u, 0u, || { } ),
|
|
|
|
Some(v0) => {
|
2012-07-14 00:57:48 -05:00
|
|
|
do s.emit_enum_variant(~"core::option::some", 1u, 1u) {
|
2012-06-30 18:19:07 -05:00
|
|
|
s.emit_enum_variant_arg(0u, || serialize_1(s, v0));
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn deserialize_1<S: serialization::deserializer>(s: S) -> int {
|
|
|
|
s.read_i64() as int
|
|
|
|
}
|
|
|
|
|
2012-08-20 14:23:37 -05:00
|
|
|
fn deserialize_0<S: serialization::deserializer>(s: S) -> Option<int> {
|
2012-07-14 00:57:48 -05:00
|
|
|
do s.read_enum(~"core::option::t") {
|
2012-06-30 18:19:07 -05:00
|
|
|
do s.read_enum_variant |i| {
|
2012-08-15 13:55:17 -05:00
|
|
|
match i {
|
2012-08-20 14:23:37 -05:00
|
|
|
0 => None,
|
2012-08-15 13:55:17 -05:00
|
|
|
1 => {
|
2012-07-04 14:04:28 -05:00
|
|
|
let v0 = do s.read_enum_variant_arg(0u) {
|
2012-03-12 12:19:35 -05:00
|
|
|
deserialize_1(s)
|
|
|
|
};
|
2012-08-20 14:23:37 -05:00
|
|
|
Some(v0)
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
2012-08-15 13:55:17 -05:00
|
|
|
_ => {
|
|
|
|
fail #fmt("deserialize_0: unexpected variant %u", i);
|
|
|
|
}
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-08-20 14:23:37 -05:00
|
|
|
fn test_v(v: Option<int>) {
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!("v == %?", v);
|
2012-03-12 12:19:35 -05:00
|
|
|
let mbuf = io::mem_buffer();
|
2012-08-11 09:08:42 -05:00
|
|
|
let ebml_w = ebml::Writer(io::mem_buffer_writer(mbuf));
|
2012-03-12 12:19:35 -05:00
|
|
|
serialize_0(ebml_w, v);
|
2012-08-29 16:45:25 -05:00
|
|
|
let ebml_doc = ebml::Doc(@io::mem_buffer_buf(mbuf));
|
2012-03-12 12:19:35 -05:00
|
|
|
let deser = ebml_deserializer(ebml_doc);
|
|
|
|
let v1 = deserialize_0(deser);
|
2012-08-22 19:24:52 -05:00
|
|
|
debug!("v1 == %?", v1);
|
2012-03-12 12:19:35 -05:00
|
|
|
assert v == v1;
|
|
|
|
}
|
|
|
|
|
2012-08-20 14:23:37 -05:00
|
|
|
test_v(Some(22));
|
|
|
|
test_v(None);
|
|
|
|
test_v(Some(3));
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|