2015-01-07 09:51:59 -06:00
|
|
|
#![feature(plugin)]
|
2014-09-06 22:41:13 -05:00
|
|
|
|
2015-01-07 09:51:59 -06:00
|
|
|
#[plugin]
|
2014-09-06 22:41:13 -05:00
|
|
|
extern crate serde_macros;
|
|
|
|
|
|
|
|
extern crate serde;
|
2015-01-07 09:51:59 -06:00
|
|
|
extern crate "rustc-serialize" as rustc_serialize;
|
2014-09-06 22:41:13 -05:00
|
|
|
extern crate test;
|
|
|
|
|
2014-05-26 11:23:05 -05:00
|
|
|
use std::fmt::Show;
|
2014-06-08 17:09:16 -05:00
|
|
|
use std::collections::HashMap;
|
2014-05-26 11:23:05 -05:00
|
|
|
use test::Bencher;
|
|
|
|
|
2015-01-07 09:51:59 -06:00
|
|
|
use rustc_serialize::{Decoder, Decodable};
|
2014-05-26 11:23:05 -05:00
|
|
|
|
2014-11-13 09:54:44 -06:00
|
|
|
use serde::de::{Deserializer, Deserialize};
|
2014-05-26 11:23:05 -05:00
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
2015-01-07 09:51:59 -06:00
|
|
|
#[derive(PartialEq, Show)]
|
2014-10-06 23:44:01 -05:00
|
|
|
pub enum Error {
|
2014-05-26 11:23:05 -05:00
|
|
|
EndOfStream,
|
|
|
|
SyntaxError,
|
2014-08-02 11:25:44 -05:00
|
|
|
OtherError(String),
|
2014-05-26 11:23:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
mod decoder {
|
2014-06-08 17:09:16 -05:00
|
|
|
use std::collections::HashMap;
|
2014-12-23 09:43:17 -06:00
|
|
|
use std::collections::hash_map::IntoIter;
|
2015-01-07 09:51:59 -06:00
|
|
|
use rustc_serialize;
|
2014-05-26 11:23:05 -05:00
|
|
|
|
2014-11-22 18:27:01 -06:00
|
|
|
use super::Error;
|
|
|
|
use super::Error::{EndOfStream, SyntaxError, OtherError};
|
|
|
|
use self::Value::{StringValue, IntValue};
|
2014-05-26 11:23:05 -05:00
|
|
|
|
|
|
|
enum Value {
|
|
|
|
StringValue(String),
|
|
|
|
IntValue(int),
|
|
|
|
}
|
|
|
|
|
|
|
|
pub struct IntDecoder {
|
|
|
|
len: uint,
|
2014-12-23 09:43:17 -06:00
|
|
|
iter: IntoIter<String, int>,
|
2014-05-26 11:23:05 -05:00
|
|
|
stack: Vec<Value>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl IntDecoder {
|
|
|
|
#[inline]
|
|
|
|
pub fn new(values: HashMap<String, int>) -> IntDecoder {
|
|
|
|
IntDecoder {
|
|
|
|
len: values.len(),
|
2014-09-29 20:58:22 -05:00
|
|
|
iter: values.into_iter(),
|
2014-05-26 11:23:05 -05:00
|
|
|
stack: vec!(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-07 09:51:59 -06:00
|
|
|
impl rustc_serialize::Decoder for IntDecoder {
|
|
|
|
type Error = Error;
|
|
|
|
|
2014-08-02 11:25:44 -05:00
|
|
|
fn error(&mut self, msg: &str) -> Error {
|
|
|
|
OtherError(msg.to_string())
|
|
|
|
}
|
|
|
|
|
2014-05-26 11:23:05 -05:00
|
|
|
// Primitive types:
|
|
|
|
fn read_nil(&mut self) -> Result<(), Error> { Err(SyntaxError) }
|
|
|
|
fn read_uint(&mut self) -> Result<uint, Error> { Err(SyntaxError) }
|
|
|
|
fn read_u64(&mut self) -> Result<u64, Error> { Err(SyntaxError) }
|
|
|
|
fn read_u32(&mut self) -> Result<u32, Error> { Err(SyntaxError) }
|
|
|
|
fn read_u16(&mut self) -> Result<u16, Error> { Err(SyntaxError) }
|
|
|
|
fn read_u8(&mut self) -> Result<u8, Error> { Err(SyntaxError) }
|
|
|
|
#[inline]
|
|
|
|
fn read_int(&mut self) -> Result<int, Error> {
|
|
|
|
match self.stack.pop() {
|
|
|
|
Some(IntValue(x)) => Ok(x),
|
|
|
|
Some(_) => Err(SyntaxError),
|
|
|
|
None => Err(EndOfStream),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fn read_i64(&mut self) -> Result<i64, Error> { Err(SyntaxError) }
|
|
|
|
fn read_i32(&mut self) -> Result<i32, Error> { Err(SyntaxError) }
|
|
|
|
fn read_i16(&mut self) -> Result<i16, Error> { Err(SyntaxError) }
|
|
|
|
fn read_i8(&mut self) -> Result<i8, Error> { Err(SyntaxError) }
|
|
|
|
fn read_bool(&mut self) -> Result<bool, Error> { Err(SyntaxError) }
|
|
|
|
fn read_f64(&mut self) -> Result<f64, Error> { Err(SyntaxError) }
|
|
|
|
fn read_f32(&mut self) -> Result<f32, Error> { Err(SyntaxError) }
|
|
|
|
fn read_char(&mut self) -> Result<char, Error> { Err(SyntaxError) }
|
|
|
|
#[inline]
|
|
|
|
fn read_str(&mut self) -> Result<String, Error> {
|
|
|
|
match self.stack.pop() {
|
|
|
|
Some(StringValue(x)) => Ok(x),
|
|
|
|
Some(_) => Err(SyntaxError),
|
|
|
|
None => Err(EndOfStream),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// 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 IntDecoder) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(Error::SyntaxError)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn read_enum_variant<T, F>(&mut self, _names: &[&str], _f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut IntDecoder, uint) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(Error::SyntaxError)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn read_enum_variant_arg<T, F>(&mut self, _a_idx: uint, _f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut IntDecoder) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(Error::SyntaxError)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn read_enum_struct_variant<T, F>(&mut self, _names: &[&str], _f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut IntDecoder, uint) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(Error::SyntaxError)
|
|
|
|
}
|
|
|
|
|
|
|
|
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 IntDecoder) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(Error::SyntaxError)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn read_struct<T, F>(&mut self, _s_name: &str, _len: uint, _f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut IntDecoder) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(Error::SyntaxError)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn read_struct_field<T, F>(&mut self, _f_name: &str, _f_idx: uint, _f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut IntDecoder) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(Error::SyntaxError)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn read_tuple<T, F>(&mut self, _len: uint, _f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut IntDecoder) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(Error::SyntaxError)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn read_tuple_arg<T, F>(&mut self, _a_idx: uint, _f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut IntDecoder) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(Error::SyntaxError)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn read_tuple_struct<T, F>(&mut self, _s_name: &str, _len: uint, _f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut IntDecoder) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(Error::SyntaxError)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn read_tuple_struct_arg<T, F>(&mut self, _a_idx: uint, _f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut IntDecoder) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(Error::SyntaxError)
|
|
|
|
}
|
2014-05-26 11:23:05 -05:00
|
|
|
|
|
|
|
// Specialized types:
|
2014-12-18 01:00:05 -06:00
|
|
|
fn read_option<T, F>(&mut self, _f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut IntDecoder, bool) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(SyntaxError)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn read_seq<T, F>(&mut self, _f: F) -> Result<T, Error> where
|
|
|
|
F: FnOnce(&mut IntDecoder, uint) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(SyntaxError)
|
|
|
|
}
|
2014-05-26 11:23:05 -05:00
|
|
|
|
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 IntDecoder) -> Result<T, Error>,
|
|
|
|
{
|
|
|
|
Err(SyntaxError)
|
|
|
|
}
|
2014-05-26 11:23:05 -05:00
|
|
|
|
|
|
|
#[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 IntDecoder, uint) -> Result<T, Error>,
|
|
|
|
{
|
2014-06-22 15:51:50 -05:00
|
|
|
let len = self.len;
|
|
|
|
f(self, len)
|
2014-05-26 11:23:05 -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 IntDecoder) -> Result<T, Error>,
|
|
|
|
{
|
2014-05-26 11:23:05 -05:00
|
|
|
match self.iter.next() {
|
|
|
|
Some((key, value)) => {
|
|
|
|
self.stack.push(IntValue(value));
|
|
|
|
self.stack.push(StringValue(key));
|
|
|
|
f(self)
|
|
|
|
}
|
|
|
|
None => {
|
|
|
|
Err(SyntaxError)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-12-18 01:00:05 -06:00
|
|
|
|
2014-05-26 11:23:05 -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 IntDecoder) -> Result<T, Error>,
|
|
|
|
{
|
2014-05-26 11:23:05 -05:00
|
|
|
f(self)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
mod deserializer {
|
2014-06-08 17:09:16 -05:00
|
|
|
use std::collections::HashMap;
|
2014-12-23 09:43:17 -06:00
|
|
|
use std::collections::hash_map::IntoIter;
|
2014-05-26 11:23:05 -05:00
|
|
|
|
2014-11-22 18:27:01 -06:00
|
|
|
use super::Error;
|
|
|
|
use super::Error::{EndOfStream, SyntaxError};
|
|
|
|
use self::State::{StartState, KeyOrEndState, ValueState, EndState};
|
2014-05-26 11:23:05 -05:00
|
|
|
|
2014-09-06 22:41:13 -05:00
|
|
|
use serde::de;
|
2014-05-26 11:23:05 -05:00
|
|
|
|
2015-01-04 19:18:50 -06:00
|
|
|
#[derive(PartialEq, Show)]
|
2014-05-26 11:23:05 -05:00
|
|
|
enum State {
|
|
|
|
StartState,
|
|
|
|
KeyOrEndState,
|
|
|
|
ValueState(int),
|
|
|
|
EndState,
|
|
|
|
}
|
|
|
|
|
|
|
|
pub struct IntDeserializer {
|
|
|
|
stack: Vec<State>,
|
|
|
|
len: uint,
|
2014-12-23 09:43:17 -06:00
|
|
|
iter: IntoIter<String, int>,
|
2014-05-26 11:23:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
impl IntDeserializer {
|
|
|
|
#[inline]
|
|
|
|
pub fn new(values: HashMap<String, int>) -> IntDeserializer {
|
|
|
|
IntDeserializer {
|
|
|
|
stack: vec!(StartState),
|
|
|
|
len: values.len(),
|
2014-09-29 20:58:22 -05:00
|
|
|
iter: values.into_iter(),
|
2014-05-26 11:23:05 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-04 19:18:50 -06:00
|
|
|
impl Iterator for IntDeserializer {
|
|
|
|
type Item = Result<de::Token, Error>;
|
|
|
|
|
2014-05-26 11:23:05 -05:00
|
|
|
#[inline]
|
|
|
|
fn next(&mut self) -> Option<Result<de::Token, Error>> {
|
|
|
|
match self.stack.pop() {
|
|
|
|
Some(StartState) => {
|
|
|
|
self.stack.push(KeyOrEndState);
|
2014-12-06 00:17:50 -06:00
|
|
|
Some(Ok(de::Token::MapStart(self.len)))
|
2014-05-26 11:23:05 -05:00
|
|
|
}
|
|
|
|
Some(KeyOrEndState) => {
|
|
|
|
match self.iter.next() {
|
|
|
|
Some((key, value)) => {
|
|
|
|
self.stack.push(ValueState(value));
|
2014-12-06 00:17:50 -06:00
|
|
|
Some(Ok(de::Token::String(key)))
|
2014-05-26 11:23:05 -05:00
|
|
|
}
|
|
|
|
None => {
|
|
|
|
self.stack.push(EndState);
|
2014-12-06 00:17:50 -06:00
|
|
|
Some(Ok(de::Token::End))
|
2014-05-26 11:23:05 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Some(ValueState(x)) => {
|
|
|
|
self.stack.push(KeyOrEndState);
|
2014-12-06 00:17:50 -06:00
|
|
|
Some(Ok(de::Token::Int(x)))
|
2014-05-26 11:23:05 -05:00
|
|
|
}
|
|
|
|
Some(EndState) => {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
None => {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl de::Deserializer<Error> for IntDeserializer {
|
|
|
|
#[inline]
|
2014-08-18 09:39:34 -05:00
|
|
|
fn end_of_stream_error(&mut self) -> Error {
|
2014-08-05 22:02:15 -05:00
|
|
|
EndOfStream
|
2014-05-26 11:23:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2014-08-18 09:39:34 -05:00
|
|
|
fn syntax_error(&mut self, _token: de::Token, _expected: &[de::TokenKind]) -> Error {
|
2014-08-05 22:02:15 -05:00
|
|
|
SyntaxError
|
2014-08-03 14:35:15 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2014-08-18 09:37:44 -05:00
|
|
|
fn unexpected_name_error(&mut self, _token: de::Token) -> Error {
|
2014-08-05 22:02:15 -05:00
|
|
|
SyntaxError
|
2014-05-26 11:23:05 -05:00
|
|
|
}
|
2014-08-06 21:24:06 -05:00
|
|
|
|
|
|
|
#[inline]
|
2014-08-18 09:37:44 -05:00
|
|
|
fn conversion_error(&mut self, _token: de::Token) -> Error {
|
2014-08-06 21:24:06 -05:00
|
|
|
SyntaxError
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2014-08-18 09:37:44 -05:00
|
|
|
fn missing_field<
|
2014-11-13 09:54:44 -06:00
|
|
|
T: de::Deserialize<IntDeserializer, Error>
|
2014-08-18 09:37:44 -05:00
|
|
|
>(&mut self, _field: &'static str) -> Result<T, Error> {
|
|
|
|
Err(SyntaxError)
|
2014-08-06 21:24:06 -05:00
|
|
|
}
|
2014-05-26 11:23:05 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
fn run_decoder<
|
2015-01-07 09:51:59 -06:00
|
|
|
D: Decoder<Error=Error>,
|
|
|
|
T: Clone + PartialEq + Show + Decodable
|
2014-05-26 11:23:05 -05:00
|
|
|
>(mut d: D, value: T) {
|
2015-01-07 09:51:59 -06:00
|
|
|
let v = Decodable::decode(&mut d);
|
2014-05-26 11:23:05 -05:00
|
|
|
|
2015-01-07 09:51:59 -06:00
|
|
|
assert_eq!(Ok(value), v);
|
2014-05-26 11:23:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[bench]
|
2014-05-26 11:43:51 -05:00
|
|
|
fn bench_decoder_000(b: &mut Bencher) {
|
2014-05-26 11:23:05 -05:00
|
|
|
b.iter(|| {
|
|
|
|
let m: HashMap<String, int> = HashMap::new();
|
|
|
|
run_decoder(decoder::IntDecoder::new(m.clone()), m)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[bench]
|
2014-05-26 11:43:51 -05:00
|
|
|
fn bench_decoder_003(b: &mut Bencher) {
|
2014-05-26 11:23:05 -05:00
|
|
|
b.iter(|| {
|
|
|
|
let mut m: HashMap<String, int> = HashMap::new();
|
2014-06-27 10:07:03 -05:00
|
|
|
for i in range(0i, 3) {
|
2014-07-09 13:33:15 -05:00
|
|
|
m.insert(i.to_string(), i);
|
2014-05-26 11:23:05 -05:00
|
|
|
}
|
|
|
|
run_decoder(decoder::IntDecoder::new(m.clone()), m)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[bench]
|
2014-05-26 11:43:51 -05:00
|
|
|
fn bench_decoder_100(b: &mut Bencher) {
|
2014-05-26 11:23:05 -05:00
|
|
|
b.iter(|| {
|
|
|
|
let mut m: HashMap<String, int> = HashMap::new();
|
2014-06-27 10:07:03 -05:00
|
|
|
for i in range(0i, 100) {
|
2014-07-09 13:33:15 -05:00
|
|
|
m.insert(i.to_string(), i);
|
2014-05-26 11:23:05 -05:00
|
|
|
}
|
|
|
|
run_decoder(decoder::IntDecoder::new(m.clone()), m)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
fn run_deserializer<
|
|
|
|
D: Deserializer<E>,
|
2014-08-19 17:18:47 -05:00
|
|
|
E: Show,
|
2014-11-13 09:54:44 -06:00
|
|
|
T: Clone + PartialEq + Show + Deserialize<D, E>
|
2014-05-26 11:23:05 -05:00
|
|
|
>(mut d: D, value: T) {
|
2014-11-13 09:54:44 -06:00
|
|
|
let v: T = Deserialize::deserialize(&mut d).unwrap();
|
2014-05-26 11:23:05 -05:00
|
|
|
|
|
|
|
assert_eq!(value, v);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[bench]
|
2014-05-26 11:43:51 -05:00
|
|
|
fn bench_deserializer_000(b: &mut Bencher) {
|
2014-05-26 11:23:05 -05:00
|
|
|
b.iter(|| {
|
|
|
|
let m: HashMap<String, int> = HashMap::new();
|
|
|
|
run_deserializer(deserializer::IntDeserializer::new(m.clone()), m)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[bench]
|
2014-05-26 11:43:51 -05:00
|
|
|
fn bench_deserializer_003(b: &mut Bencher) {
|
2014-05-26 11:23:05 -05:00
|
|
|
b.iter(|| {
|
|
|
|
let mut m: HashMap<String, int> = HashMap::new();
|
2014-06-27 10:07:03 -05:00
|
|
|
for i in range(0i, 3) {
|
2014-07-09 13:33:15 -05:00
|
|
|
m.insert(i.to_string(), i);
|
2014-05-26 11:23:05 -05:00
|
|
|
}
|
|
|
|
run_deserializer(deserializer::IntDeserializer::new(m.clone()), m)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[bench]
|
2014-05-26 11:43:51 -05:00
|
|
|
fn bench_deserializer_100(b: &mut Bencher) {
|
2014-05-26 11:23:05 -05:00
|
|
|
b.iter(|| {
|
|
|
|
let mut m: HashMap<String, int> = HashMap::new();
|
2014-06-27 10:07:03 -05:00
|
|
|
for i in range(0i, 100) {
|
2014-07-09 13:33:15 -05:00
|
|
|
m.insert(i.to_string(), i);
|
2014-05-26 11:23:05 -05:00
|
|
|
}
|
|
|
|
run_deserializer(deserializer::IntDeserializer::new(m.clone()), m)
|
|
|
|
})
|
|
|
|
}
|