2014-09-06 22:41:13 -05:00
|
|
|
#![feature(phase)]
|
|
|
|
|
|
|
|
#[phase(plugin)]
|
|
|
|
extern crate serde_macros;
|
|
|
|
|
|
|
|
extern crate serde;
|
|
|
|
extern crate serialize;
|
|
|
|
extern crate test;
|
|
|
|
|
2014-06-08 17:09:16 -05:00
|
|
|
use std::collections::HashMap;
|
2014-05-23 22:41:29 -05:00
|
|
|
use test::Bencher;
|
|
|
|
|
|
|
|
use serialize::{Decoder, Decodable};
|
|
|
|
|
2014-11-13 09:54:44 -06:00
|
|
|
use serde::de::{Deserializer, Deserialize};
|
2014-05-23 22:41:29 -05:00
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
2014-05-31 14:28:30 -05:00
|
|
|
#[deriving(Clone, PartialEq, Show, Decodable)]
|
2014-11-13 09:54:44 -06:00
|
|
|
#[deriving_deserialize]
|
2014-05-23 22:41:29 -05:00
|
|
|
struct Inner {
|
|
|
|
a: (),
|
|
|
|
b: uint,
|
2014-05-26 09:18:18 -05:00
|
|
|
c: HashMap<String, Option<char>>,
|
2014-05-23 22:41:29 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
2014-05-31 14:28:30 -05:00
|
|
|
#[deriving(Clone, PartialEq, Show, Decodable)]
|
2014-11-13 09:54:44 -06:00
|
|
|
#[deriving_deserialize]
|
2014-05-23 22:41:29 -05:00
|
|
|
struct Outer {
|
|
|
|
inner: Vec<Inner>,
|
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
#[deriving(Show)]
|
2014-10-06 23:44:01 -05:00
|
|
|
pub enum Error {
|
2014-05-23 22:41:29 -05:00
|
|
|
EndOfStream,
|
2014-10-22 21:09:59 -05:00
|
|
|
SyntaxError(String),
|
|
|
|
UnexpectedName(String),
|
|
|
|
ConversionError(String),
|
|
|
|
MissingField(&'static str),
|
2014-08-02 11:25:44 -05:00
|
|
|
OtherError(String),
|
2014-05-23 22:41:29 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
mod decoder {
|
2014-06-08 17:09:16 -05:00
|
|
|
use std::collections::HashMap;
|
2014-05-23 22:41:29 -05:00
|
|
|
use serialize::Decoder;
|
|
|
|
|
2014-11-22 18:27:01 -06:00
|
|
|
use super::{Outer, Inner, Error};
|
|
|
|
|
|
|
|
use self::State::{
|
|
|
|
OuterState,
|
|
|
|
InnerState,
|
|
|
|
NullState,
|
|
|
|
UintState,
|
|
|
|
CharState,
|
|
|
|
StringState,
|
|
|
|
FieldState,
|
|
|
|
VecState,
|
|
|
|
MapState,
|
|
|
|
OptionState,
|
|
|
|
};
|
2014-05-23 22:41:29 -05:00
|
|
|
|
|
|
|
#[deriving(Show)]
|
|
|
|
enum State {
|
|
|
|
OuterState(Outer),
|
|
|
|
InnerState(Inner),
|
|
|
|
NullState,
|
|
|
|
UintState(uint),
|
|
|
|
CharState(char),
|
2014-05-26 09:18:18 -05:00
|
|
|
StringState(String),
|
2014-05-23 22:41:29 -05:00
|
|
|
FieldState(&'static str),
|
|
|
|
VecState(Vec<Inner>),
|
2014-05-26 09:18:18 -05:00
|
|
|
MapState(HashMap<String, Option<char>>),
|
2014-05-23 22:41:29 -05:00
|
|
|
OptionState(bool),
|
|
|
|
}
|
|
|
|
|
|
|
|
pub struct OuterDecoder {
|
|
|
|
stack: Vec<State>,
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
impl OuterDecoder {
|
|
|
|
#[inline]
|
|
|
|
pub fn new(animal: Outer) -> OuterDecoder {
|
|
|
|
OuterDecoder {
|
|
|
|
stack: vec!(OuterState(animal)),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Decoder<Error> for OuterDecoder {
|
2014-08-02 11:25:44 -05:00
|
|
|
fn error(&mut self, msg: &str) -> Error {
|
2014-11-22 18:27:01 -06:00
|
|
|
Error::OtherError(msg.to_string())
|
2014-08-02 11:25:44 -05:00
|
|
|
}
|
|
|
|
|
2014-05-23 22:41:29 -05:00
|
|
|
// Primitive types:
|
|
|
|
#[inline]
|
|
|
|
fn read_nil(&mut self) -> Result<(), Error> {
|
|
|
|
match self.stack.pop() {
|
|
|
|
Some(NullState) => Ok(()),
|
2014-11-22 18:27:01 -06:00
|
|
|
_ => Err(Error::SyntaxError("NullState".to_string())),
|
2014-05-23 22:41:29 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#[inline]
|
|
|
|
fn read_uint(&mut self) -> Result<uint, Error> {
|
|
|
|
match self.stack.pop() {
|
|
|
|
Some(UintState(value)) => Ok(value),
|
2014-11-22 18:27:01 -06:00
|
|
|
_ => Err(Error::SyntaxError("UintState".to_string())),
|
2014-05-23 22:41:29 -05:00
|
|
|
}
|
|
|
|
}
|
2014-11-22 18:27:01 -06:00
|
|
|
fn read_u64(&mut self) -> Result<u64, Error> { Err(Error::SyntaxError("".to_string())) }
|
|
|
|
fn read_u32(&mut self) -> Result<u32, Error> { Err(Error::SyntaxError("".to_string())) }
|
|
|
|
fn read_u16(&mut self) -> Result<u16, Error> { Err(Error::SyntaxError("".to_string())) }
|
|
|
|
fn read_u8(&mut self) -> Result<u8, Error> { Err(Error::SyntaxError("".to_string())) }
|
|
|
|
fn read_int(&mut self) -> Result<int, Error> { Err(Error::SyntaxError("".to_string())) }
|
|
|
|
fn read_i64(&mut self) -> Result<i64, Error> { Err(Error::SyntaxError("".to_string())) }
|
|
|
|
fn read_i32(&mut self) -> Result<i32, Error> { Err(Error::SyntaxError("".to_string())) }
|
|
|
|
fn read_i16(&mut self) -> Result<i16, Error> { Err(Error::SyntaxError("".to_string())) }
|
|
|
|
fn read_i8(&mut self) -> Result<i8, Error> { Err(Error::SyntaxError("".to_string())) }
|
|
|
|
fn read_bool(&mut self) -> Result<bool, Error> { Err(Error::SyntaxError("".to_string())) }
|
|
|
|
fn read_f64(&mut self) -> Result<f64, Error> { Err(Error::SyntaxError("".to_string())) }
|
|
|
|
fn read_f32(&mut self) -> Result<f32, Error> { Err(Error::SyntaxError("".to_string())) }
|
2014-05-23 22:41:29 -05:00
|
|
|
#[inline]
|
|
|
|
fn read_char(&mut self) -> Result<char, Error> {
|
|
|
|
match self.stack.pop() {
|
|
|
|
Some(CharState(c)) => Ok(c),
|
2014-11-22 18:27:01 -06:00
|
|
|
_ => Err(Error::SyntaxError("".to_string())),
|
2014-05-23 22:41:29 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#[inline]
|
2014-05-26 09:18:18 -05:00
|
|
|
fn read_str(&mut self) -> Result<String, Error> {
|
2014-05-23 22:41:29 -05:00
|
|
|
match self.stack.pop() {
|
2014-05-26 09:18:18 -05:00
|
|
|
Some(StringState(value)) => Ok(value),
|
2014-11-22 18:27:01 -06:00
|
|
|
_ => Err(Error::SyntaxError("".to_string())),
|
2014-05-23 22:41:29 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Compound types:
|
2014-12-18 01:00:05 -06:00
|
|
|
fn read_enum<T, F>(&mut self, _name: &str, _f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(Error::SyntaxError("".to_string()))
|
|
|
|
}
|
|
|
|
|
|
|
|
fn read_enum_variant<T, F>(&mut self, _names: &[&str], _f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut OuterDecoder, uint) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(Error::SyntaxError("".to_string()))
|
|
|
|
}
|
|
|
|
|
|
|
|
fn read_enum_variant_arg<T, F>(&mut self, _a_idx: uint, _f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(Error::SyntaxError("".to_string()))
|
|
|
|
}
|
|
|
|
|
|
|
|
fn read_enum_struct_variant<T, F>(&mut self, _names: &[&str], _f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut OuterDecoder, uint) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(Error::SyntaxError("".to_string()))
|
|
|
|
}
|
|
|
|
|
|
|
|
fn read_enum_struct_variant_field<T, F>(&mut self, _f_name: &str, _f_idx: uint, _f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(Error::SyntaxError("".to_string()))
|
|
|
|
}
|
2014-05-23 22:41:29 -05:00
|
|
|
|
|
|
|
#[inline]
|
2014-12-18 01:00:05 -06:00
|
|
|
fn read_struct<T, F>(&mut self, s_name: &str, _len: uint, f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
|
|
|
|
{
|
2014-05-23 22:41:29 -05:00
|
|
|
match self.stack.pop() {
|
2014-11-03 14:58:36 -06:00
|
|
|
Some(OuterState(Outer { inner })) => {
|
2014-05-23 22:41:29 -05:00
|
|
|
if s_name == "Outer" {
|
|
|
|
self.stack.push(VecState(inner));
|
|
|
|
self.stack.push(FieldState("inner"));
|
|
|
|
f(self)
|
|
|
|
} else {
|
2014-11-22 18:27:01 -06:00
|
|
|
Err(Error::SyntaxError("expected Outer".to_string()))
|
2014-05-23 22:41:29 -05:00
|
|
|
}
|
|
|
|
}
|
2014-11-03 14:58:36 -06:00
|
|
|
Some(InnerState(Inner { a: (), b, c })) => {
|
2014-05-23 22:41:29 -05:00
|
|
|
if s_name == "Inner" {
|
|
|
|
self.stack.push(MapState(c));
|
|
|
|
self.stack.push(FieldState("c"));
|
|
|
|
|
|
|
|
self.stack.push(UintState(b));
|
|
|
|
self.stack.push(FieldState("b"));
|
|
|
|
|
|
|
|
self.stack.push(NullState);
|
|
|
|
self.stack.push(FieldState("a"));
|
|
|
|
f(self)
|
|
|
|
} else {
|
2014-11-22 18:27:01 -06:00
|
|
|
Err(Error::SyntaxError("expected Inner".to_string()))
|
2014-05-23 22:41:29 -05:00
|
|
|
}
|
|
|
|
}
|
2014-11-22 18:27:01 -06:00
|
|
|
_ => Err(Error::SyntaxError("expected InnerState or OuterState".to_string())),
|
2014-05-23 22:41:29 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#[inline]
|
2014-12-18 01:00:05 -06:00
|
|
|
fn read_struct_field<T, F>(&mut self, f_name: &str, _f_idx: uint, f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
|
|
|
|
{
|
2014-05-23 22:41:29 -05:00
|
|
|
match self.stack.pop() {
|
|
|
|
Some(FieldState(name)) => {
|
|
|
|
if f_name == name {
|
|
|
|
f(self)
|
|
|
|
} else {
|
2014-11-22 18:27:01 -06:00
|
|
|
Err(Error::SyntaxError("expected FieldState".to_string()))
|
2014-05-23 22:41:29 -05:00
|
|
|
}
|
|
|
|
}
|
2014-11-22 18:27:01 -06:00
|
|
|
_ => Err(Error::SyntaxError("expected FieldState".to_string()))
|
2014-05-23 22:41:29 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-18 01:00:05 -06:00
|
|
|
fn read_tuple<T, F>(&mut self, _len: uint, _f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(Error::SyntaxError("".to_string()))
|
|
|
|
}
|
|
|
|
|
|
|
|
fn read_tuple_arg<T, F>(&mut self, _a_idx: uint, _f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(Error::SyntaxError("".to_string()))
|
|
|
|
}
|
|
|
|
|
|
|
|
fn read_tuple_struct<T, F>(&mut self, _s_name: &str, _len: uint, _f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(Error::SyntaxError("".to_string()))
|
|
|
|
}
|
2014-05-23 22:41:29 -05:00
|
|
|
|
2014-12-18 01:00:05 -06:00
|
|
|
fn read_tuple_struct_arg<T, F>(&mut self, _a_idx: uint, _f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(Error::SyntaxError("".to_string()))
|
|
|
|
}
|
2014-05-23 22:41:29 -05:00
|
|
|
|
|
|
|
// Specialized types:
|
|
|
|
#[inline]
|
2014-12-18 01:00:05 -06:00
|
|
|
fn read_option<T, F>(&mut self, f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut OuterDecoder, bool) -> Result<T, Error>,
|
|
|
|
{
|
2014-05-23 22:41:29 -05:00
|
|
|
match self.stack.pop() {
|
|
|
|
Some(OptionState(b)) => f(self, b),
|
2014-11-22 18:27:01 -06:00
|
|
|
_ => Err(Error::SyntaxError("expected OptionState".to_string())),
|
2014-05-23 22:41:29 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2014-12-18 01:00:05 -06:00
|
|
|
fn read_seq<T, F>(&mut self, f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut OuterDecoder, uint) -> Result<T, Error>,
|
|
|
|
{
|
2014-05-23 22:41:29 -05:00
|
|
|
match self.stack.pop() {
|
|
|
|
Some(VecState(value)) => {
|
|
|
|
let len = value.len();
|
2014-09-29 20:58:22 -05:00
|
|
|
for inner in value.into_iter().rev() {
|
2014-05-23 22:41:29 -05:00
|
|
|
self.stack.push(InnerState(inner));
|
|
|
|
}
|
|
|
|
f(self, len)
|
|
|
|
}
|
2014-11-22 18:27:01 -06:00
|
|
|
_ => Err(Error::SyntaxError("expected VecState".to_string()))
|
2014-05-23 22:41:29 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#[inline]
|
2014-12-18 01:00:05 -06:00
|
|
|
fn read_seq_elt<T, F>(&mut self, _idx: uint, f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
|
|
|
|
{
|
2014-05-23 22:41:29 -05:00
|
|
|
f(self)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2014-12-18 01:00:05 -06:00
|
|
|
fn read_map<T, F>(&mut self, f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut OuterDecoder, uint) -> Result<T, Error>,
|
|
|
|
{
|
2014-05-23 22:41:29 -05:00
|
|
|
match self.stack.pop() {
|
|
|
|
Some(MapState(map)) => {
|
|
|
|
let len = map.len();
|
2014-09-29 20:58:22 -05:00
|
|
|
for (key, value) in map.into_iter() {
|
2014-05-23 22:41:29 -05:00
|
|
|
match value {
|
|
|
|
Some(c) => {
|
|
|
|
self.stack.push(CharState(c));
|
|
|
|
self.stack.push(OptionState(true));
|
|
|
|
}
|
|
|
|
None => {
|
|
|
|
self.stack.push(OptionState(false));
|
|
|
|
}
|
|
|
|
}
|
2014-05-26 09:18:18 -05:00
|
|
|
self.stack.push(StringState(key));
|
2014-05-23 22:41:29 -05:00
|
|
|
}
|
|
|
|
f(self, len)
|
|
|
|
}
|
2014-11-22 18:27:01 -06:00
|
|
|
_ => Err(Error::SyntaxError("expected MapState".to_string())),
|
2014-05-23 22:41:29 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#[inline]
|
2014-12-18 01:00:05 -06:00
|
|
|
fn read_map_elt_key<T, F>(&mut self, _idx: uint, f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
|
|
|
|
{
|
2014-05-23 22:41:29 -05:00
|
|
|
f(self)
|
|
|
|
}
|
2014-12-18 01:00:05 -06:00
|
|
|
|
2014-05-23 22:41:29 -05:00
|
|
|
#[inline]
|
2014-12-18 01:00:05 -06:00
|
|
|
fn read_map_elt_val<T, F>(&mut self, _idx: uint, f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
|
|
|
|
{
|
2014-05-23 22:41:29 -05:00
|
|
|
f(self)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
mod deserializer {
|
2014-06-08 17:09:16 -05:00
|
|
|
use std::collections::HashMap;
|
2014-10-22 21:09:59 -05:00
|
|
|
use super::{Outer, Inner};
|
2014-11-22 18:27:01 -06:00
|
|
|
use super::Error;
|
2014-09-06 22:41:13 -05:00
|
|
|
use serde::de;
|
2014-05-23 22:41:29 -05:00
|
|
|
|
2014-11-22 18:27:01 -06:00
|
|
|
use self::State::{
|
|
|
|
OuterState,
|
|
|
|
InnerState,
|
|
|
|
FieldState,
|
|
|
|
NullState,
|
|
|
|
UintState,
|
|
|
|
CharState,
|
|
|
|
StringState,
|
|
|
|
OptionState,
|
|
|
|
//TupleState(uint),
|
|
|
|
VecState,
|
|
|
|
MapState,
|
|
|
|
EndState,
|
|
|
|
};
|
|
|
|
|
2014-10-22 21:09:59 -05:00
|
|
|
#[deriving(Show)]
|
2014-05-23 22:41:29 -05:00
|
|
|
enum State {
|
|
|
|
OuterState(Outer),
|
|
|
|
InnerState(Inner),
|
|
|
|
FieldState(&'static str),
|
|
|
|
NullState,
|
|
|
|
UintState(uint),
|
|
|
|
CharState(char),
|
2014-05-26 09:18:18 -05:00
|
|
|
StringState(String),
|
2014-05-23 22:41:29 -05:00
|
|
|
OptionState(bool),
|
2014-10-22 20:10:40 -05:00
|
|
|
//TupleState(uint),
|
2014-05-26 09:46:17 -05:00
|
|
|
VecState(Vec<Inner>),
|
|
|
|
MapState(HashMap<String, Option<char>>),
|
2014-05-23 22:41:29 -05:00
|
|
|
EndState,
|
|
|
|
}
|
|
|
|
|
|
|
|
pub struct OuterDeserializer {
|
|
|
|
stack: Vec<State>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl OuterDeserializer {
|
|
|
|
#[inline]
|
|
|
|
pub fn new(outer: Outer) -> OuterDeserializer {
|
|
|
|
OuterDeserializer {
|
|
|
|
stack: vec!(OuterState(outer)),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-08-03 14:35:15 -05:00
|
|
|
impl Iterator<Result<de::Token, Error>> for OuterDeserializer {
|
2014-05-23 22:41:29 -05:00
|
|
|
#[inline]
|
2014-08-03 14:35:15 -05:00
|
|
|
fn next(&mut self) -> Option<Result<de::Token, Error>> {
|
2014-05-26 09:46:17 -05:00
|
|
|
match self.stack.pop() {
|
|
|
|
Some(OuterState(Outer { inner })) => {
|
2014-05-26 00:16:34 -05:00
|
|
|
self.stack.push(EndState);
|
2014-05-26 09:46:17 -05:00
|
|
|
self.stack.push(VecState(inner));
|
2014-05-26 00:16:34 -05:00
|
|
|
self.stack.push(FieldState("inner"));
|
2014-12-06 00:17:50 -06:00
|
|
|
Some(Ok(de::Token::StructStart("Outer", 1)))
|
2014-05-23 22:41:29 -05:00
|
|
|
}
|
2014-05-26 09:46:17 -05:00
|
|
|
Some(InnerState(Inner { a: (), b, c })) => {
|
2014-05-26 00:16:34 -05:00
|
|
|
self.stack.push(EndState);
|
2014-05-26 09:46:17 -05:00
|
|
|
self.stack.push(MapState(c));
|
|
|
|
self.stack.push(FieldState("c"));
|
2014-05-26 00:16:34 -05:00
|
|
|
|
2014-05-26 09:46:17 -05:00
|
|
|
self.stack.push(UintState(b));
|
|
|
|
self.stack.push(FieldState("b"));
|
|
|
|
|
|
|
|
self.stack.push(NullState);
|
|
|
|
self.stack.push(FieldState("a"));
|
2014-12-06 00:17:50 -06:00
|
|
|
Some(Ok(de::Token::StructStart("Inner", 3)))
|
2014-05-26 09:46:17 -05:00
|
|
|
}
|
2014-12-06 00:17:50 -06:00
|
|
|
Some(FieldState(name)) => Some(Ok(de::Token::Str(name))),
|
2014-05-26 09:46:17 -05:00
|
|
|
Some(VecState(value)) => {
|
|
|
|
self.stack.push(EndState);
|
|
|
|
let len = value.len();
|
2014-09-29 20:58:22 -05:00
|
|
|
for inner in value.into_iter().rev() {
|
2014-05-26 09:46:17 -05:00
|
|
|
self.stack.push(InnerState(inner));
|
|
|
|
}
|
2014-12-06 00:17:50 -06:00
|
|
|
Some(Ok(de::Token::SeqStart(len)))
|
2014-05-26 09:46:17 -05:00
|
|
|
}
|
|
|
|
Some(MapState(value)) => {
|
2014-05-26 00:16:34 -05:00
|
|
|
self.stack.push(EndState);
|
2014-05-26 09:46:17 -05:00
|
|
|
let len = value.len();
|
2014-09-29 20:58:22 -05:00
|
|
|
for (key, value) in value.into_iter() {
|
2014-05-26 09:46:17 -05:00
|
|
|
match value {
|
2014-05-26 00:16:34 -05:00
|
|
|
Some(c) => {
|
|
|
|
self.stack.push(CharState(c));
|
|
|
|
self.stack.push(OptionState(true));
|
|
|
|
}
|
|
|
|
None => {
|
|
|
|
self.stack.push(OptionState(false));
|
|
|
|
}
|
|
|
|
}
|
2014-05-26 09:46:17 -05:00
|
|
|
self.stack.push(StringState(key));
|
2014-05-26 00:16:34 -05:00
|
|
|
}
|
2014-12-06 00:17:50 -06:00
|
|
|
Some(Ok(de::Token::MapStart(len)))
|
2014-05-23 22:41:29 -05:00
|
|
|
}
|
2014-12-06 00:17:50 -06:00
|
|
|
//Some(TupleState(len)) => Some(Ok(de::Token::TupleStart(len))),
|
|
|
|
Some(NullState) => Some(Ok(de::Token::Null)),
|
|
|
|
Some(UintState(x)) => Some(Ok(de::Token::Uint(x))),
|
|
|
|
Some(CharState(x)) => Some(Ok(de::Token::Char(x))),
|
|
|
|
Some(StringState(x)) => Some(Ok(de::Token::String(x))),
|
|
|
|
Some(OptionState(x)) => Some(Ok(de::Token::Option(x))),
|
2014-05-26 09:46:17 -05:00
|
|
|
Some(EndState) => {
|
2014-12-06 00:17:50 -06:00
|
|
|
Some(Ok(de::Token::End))
|
2014-05-23 22:41:29 -05:00
|
|
|
}
|
|
|
|
None => None,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-08-03 14:35:15 -05:00
|
|
|
impl de::Deserializer<Error> for OuterDeserializer {
|
2014-05-23 22:41:29 -05:00
|
|
|
#[inline]
|
2014-08-18 09:39:34 -05:00
|
|
|
fn end_of_stream_error(&mut self) -> Error {
|
2014-11-22 18:27:01 -06:00
|
|
|
Error::EndOfStream
|
2014-05-23 22:41:29 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2014-10-22 21:09:59 -05:00
|
|
|
fn syntax_error(&mut self, token: de::Token, expected: &[de::TokenKind]) -> Error {
|
2014-11-22 18:27:01 -06:00
|
|
|
Error::SyntaxError(format!("expected {}, found {}", expected, token))
|
2014-08-03 14:35:15 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2014-10-22 21:09:59 -05:00
|
|
|
fn unexpected_name_error(&mut self, token: de::Token) -> Error {
|
2014-11-22 18:27:01 -06:00
|
|
|
Error::UnexpectedName(format!("found {}", token))
|
2014-05-23 22:41:29 -05:00
|
|
|
}
|
2014-08-06 21:24:06 -05:00
|
|
|
|
|
|
|
#[inline]
|
2014-10-22 21:09:59 -05:00
|
|
|
fn conversion_error(&mut self, token: de::Token) -> Error {
|
2014-11-22 18:27:01 -06:00
|
|
|
Error::UnexpectedName(format!("found {}", token))
|
2014-08-06 21:24:06 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2014-08-18 09:37:44 -05:00
|
|
|
fn missing_field<
|
2014-11-13 09:54:44 -06:00
|
|
|
T: de::Deserialize<OuterDeserializer, Error>
|
2014-10-22 21:09:59 -05:00
|
|
|
>(&mut self, field: &'static str) -> Result<T, Error> {
|
2014-11-22 18:27:01 -06:00
|
|
|
Err(Error::MissingField(field))
|
2014-08-06 21:24:06 -05:00
|
|
|
}
|
2014-05-23 22:41:29 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-26 00:20:06 -05:00
|
|
|
#[bench]
|
2014-05-26 11:43:51 -05:00
|
|
|
fn bench_decoder_0_0(b: &mut Bencher) {
|
2014-05-26 00:20:06 -05:00
|
|
|
b.iter(|| {
|
|
|
|
let mut map = HashMap::new();
|
2014-05-29 08:44:38 -05:00
|
|
|
map.insert("abc".to_string(), Some('c'));
|
2014-05-26 00:20:06 -05:00
|
|
|
|
|
|
|
let outer = Outer {
|
|
|
|
inner: vec!(),
|
|
|
|
};
|
|
|
|
|
|
|
|
let mut d = decoder::OuterDecoder::new(outer.clone());
|
|
|
|
let value: Outer = Decodable::decode(&mut d).unwrap();
|
|
|
|
|
|
|
|
assert_eq!(value, outer);
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[bench]
|
2014-05-26 11:43:51 -05:00
|
|
|
fn bench_decoder_1_0(b: &mut Bencher) {
|
2014-05-26 00:20:06 -05:00
|
|
|
b.iter(|| {
|
2014-05-26 09:46:17 -05:00
|
|
|
let map = HashMap::new();
|
2014-05-26 00:20:06 -05:00
|
|
|
|
|
|
|
let outer = Outer {
|
2014-05-26 09:46:17 -05:00
|
|
|
inner: vec!(
|
|
|
|
Inner {
|
|
|
|
a: (),
|
|
|
|
b: 5,
|
|
|
|
c: map,
|
|
|
|
},
|
|
|
|
)
|
2014-05-26 00:20:06 -05:00
|
|
|
};
|
|
|
|
|
2014-05-26 09:46:17 -05:00
|
|
|
let mut d = decoder::OuterDecoder::new(outer.clone());
|
|
|
|
let value: Outer = Decodable::decode(&mut d).unwrap();
|
2014-05-26 00:20:06 -05:00
|
|
|
|
|
|
|
assert_eq!(value, outer);
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2014-05-23 22:41:29 -05:00
|
|
|
#[bench]
|
2014-05-26 11:43:51 -05:00
|
|
|
fn bench_decoder_1_5(b: &mut Bencher) {
|
2014-05-23 22:41:29 -05:00
|
|
|
b.iter(|| {
|
|
|
|
let mut map = HashMap::new();
|
2014-05-29 08:44:38 -05:00
|
|
|
map.insert("1".to_string(), Some('a'));
|
|
|
|
map.insert("2".to_string(), None);
|
|
|
|
map.insert("3".to_string(), Some('b'));
|
|
|
|
map.insert("4".to_string(), None);
|
|
|
|
map.insert("5".to_string(), Some('c'));
|
2014-05-23 22:41:29 -05:00
|
|
|
|
|
|
|
let outer = Outer {
|
|
|
|
inner: vec!(
|
|
|
|
Inner {
|
|
|
|
a: (),
|
|
|
|
b: 5,
|
|
|
|
c: map,
|
|
|
|
},
|
|
|
|
)
|
|
|
|
};
|
|
|
|
|
|
|
|
let mut d = decoder::OuterDecoder::new(outer.clone());
|
|
|
|
let value: Outer = Decodable::decode(&mut d).unwrap();
|
|
|
|
|
|
|
|
assert_eq!(value, outer);
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[bench]
|
2014-05-26 11:43:51 -05:00
|
|
|
fn bench_deserializer_0_0(b: &mut Bencher) {
|
2014-05-23 22:41:29 -05:00
|
|
|
b.iter(|| {
|
|
|
|
let outer = Outer {
|
2014-05-26 09:46:17 -05:00
|
|
|
inner: vec!(),
|
2014-05-23 22:41:29 -05:00
|
|
|
};
|
|
|
|
|
|
|
|
let mut d = deserializer::OuterDeserializer::new(outer.clone());
|
2014-11-13 09:54:44 -06:00
|
|
|
let value: Outer = Deserialize::deserialize(&mut d).unwrap();
|
2014-05-23 22:41:29 -05:00
|
|
|
|
|
|
|
assert_eq!(value, outer);
|
|
|
|
})
|
|
|
|
}
|
2014-05-26 00:20:06 -05:00
|
|
|
|
|
|
|
#[bench]
|
2014-05-26 11:43:51 -05:00
|
|
|
fn bench_deserializer_1_0(b: &mut Bencher) {
|
2014-05-26 00:20:06 -05:00
|
|
|
b.iter(|| {
|
2014-05-26 09:46:17 -05:00
|
|
|
let map = HashMap::new();
|
2014-05-26 00:20:06 -05:00
|
|
|
|
|
|
|
let outer = Outer {
|
|
|
|
inner: vec!(
|
|
|
|
Inner {
|
|
|
|
a: (),
|
|
|
|
b: 5,
|
|
|
|
c: map,
|
|
|
|
},
|
|
|
|
)
|
|
|
|
};
|
|
|
|
|
2014-05-26 09:46:17 -05:00
|
|
|
let mut d = deserializer::OuterDeserializer::new(outer.clone());
|
2014-11-13 09:54:44 -06:00
|
|
|
let value: Outer = Deserialize::deserialize(&mut d).unwrap();
|
2014-05-26 00:20:06 -05:00
|
|
|
|
|
|
|
assert_eq!(value, outer);
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[bench]
|
2014-05-26 11:43:51 -05:00
|
|
|
fn bench_deserializer_1_5(b: &mut Bencher) {
|
2014-05-26 00:20:06 -05:00
|
|
|
b.iter(|| {
|
|
|
|
let mut map = HashMap::new();
|
2014-05-29 08:44:38 -05:00
|
|
|
map.insert("1".to_string(), Some('a'));
|
|
|
|
map.insert("2".to_string(), None);
|
|
|
|
map.insert("3".to_string(), Some('b'));
|
|
|
|
map.insert("4".to_string(), None);
|
|
|
|
map.insert("5".to_string(), Some('c'));
|
2014-05-26 00:20:06 -05:00
|
|
|
|
|
|
|
let outer = Outer {
|
|
|
|
inner: vec!(
|
|
|
|
Inner {
|
|
|
|
a: (),
|
|
|
|
b: 5,
|
|
|
|
c: map,
|
|
|
|
},
|
|
|
|
)
|
|
|
|
};
|
|
|
|
|
|
|
|
let mut d = deserializer::OuterDeserializer::new(outer.clone());
|
2014-11-13 09:54:44 -06:00
|
|
|
let value: Outer = Deserialize::deserialize(&mut d).unwrap();
|
2014-05-26 00:20:06 -05:00
|
|
|
|
|
|
|
assert_eq!(value, outer);
|
|
|
|
})
|
|
|
|
}
|