24 named!(end_of_message, tag!("\n\n")); |
24 named!(end_of_message, tag!("\n\n")); |
25 named!(str_line<&[u8], &str>, map_res!(not_line_ending, str::from_utf8)); |
25 named!(str_line<&[u8], &str>, map_res!(not_line_ending, str::from_utf8)); |
26 named!( a_line<&[u8], String>, map!(str_line, String::from)); |
26 named!( a_line<&[u8], String>, map!(str_line, String::from)); |
27 named!( u8_line<&[u8], u8>, map_res!(str_line, FromStr::from_str)); |
27 named!( u8_line<&[u8], u8>, map_res!(str_line, FromStr::from_str)); |
28 named!(u32_line<&[u8], u32>, map_res!(str_line, FromStr::from_str)); |
28 named!(u32_line<&[u8], u32>, map_res!(str_line, FromStr::from_str)); |
29 named!(opt_param<&[u8], Option<String> >, opt!(map!(flat_map!(preceded!(eol, str_line), non_empty), String::from))); |
29 named!(opt_param<&[u8], Option<String> >, alt!( |
|
30 do_parse!(peek!(tag!("\n\n")) >> (None)) |
|
31 | do_parse!(tag!("\n") >> s: str_line >> (Some(s.to_string()))))); |
30 named!(spaces<&[u8], &[u8]>, preceded!(tag!(" "), eat_separator!(" "))); |
32 named!(spaces<&[u8], &[u8]>, preceded!(tag!(" "), eat_separator!(" "))); |
31 named!(opt_space_param<&[u8], Option<String> >, opt!(map!(flat_map!(preceded!(spaces, str_line), non_empty), String::from))); |
33 named!(opt_space_param<&[u8], Option<String> >, alt!( |
|
34 do_parse!(peek!(tag!("\n\n")) >> (None)) |
|
35 | do_parse!(spaces >> s: str_line >> (Some(s.to_string()))))); |
32 named!(hog_line<&[u8], HedgehogInfo>, |
36 named!(hog_line<&[u8], HedgehogInfo>, |
33 do_parse!(name: str_line >> eol >> hat: str_line >> |
37 do_parse!(name: str_line >> eol >> hat: str_line >> |
34 (HedgehogInfo{name: name.to_string(), hat: hat.to_string()}))); |
38 (HedgehogInfo{name: name.to_string(), hat: hat.to_string()}))); |
35 named!(_8_hogs<&[u8], [HedgehogInfo; 8]>, |
39 named!(_8_hogs<&[u8], [HedgehogInfo; 8]>, |
36 do_parse!(h1: hog_line >> eol >> h2: hog_line >> eol >> |
40 do_parse!(h1: hog_line >> eol >> h2: hog_line >> eol >> |
220 |
224 |
221 proptest! { |
225 proptest! { |
222 #[test] |
226 #[test] |
223 fn is_parser_composition_idempotent(ref msg in gen_proto_msg()) { |
227 fn is_parser_composition_idempotent(ref msg in gen_proto_msg()) { |
224 println!("!! Msg: {:?}, Bytes: {:?} !!", msg, msg.to_raw_protocol().as_bytes()); |
228 println!("!! Msg: {:?}, Bytes: {:?} !!", msg, msg.to_raw_protocol().as_bytes()); |
225 assert_eq!(message(msg.to_raw_protocol().as_bytes()), IResult::Done(&b""[..], msg.clone())) |
229 assert_eq!(message(msg.to_raw_protocol().as_bytes()), Ok((&b""[..], msg.clone()))) |
226 } |
230 } |
227 } |
231 } |
228 |
232 |
229 #[test] |
233 #[test] |
230 fn parse_test() { |
234 fn parse_test() { |
231 assert_eq!(message(b"PING\n\n"), IResult::Done(&b""[..], Ping)); |
235 assert_eq!(message(b"PING\n\n"), Ok((&b""[..], Ping))); |
232 assert_eq!(message(b"START_GAME\n\n"), IResult::Done(&b""[..], StartGame)); |
236 assert_eq!(message(b"START_GAME\n\n"), Ok((&b""[..], StartGame))); |
233 assert_eq!(message(b"NICK\nit's me\n\n"), IResult::Done(&b""[..], Nick("it's me".to_string()))); |
237 assert_eq!(message(b"NICK\nit's me\n\n"), Ok((&b""[..], Nick("it's me".to_string())))); |
234 assert_eq!(message(b"PROTO\n51\n\n"), IResult::Done(&b""[..], Proto(51))); |
238 assert_eq!(message(b"PROTO\n51\n\n"), Ok((&b""[..], Proto(51)))); |
235 assert_eq!(message(b"QUIT\nbye-bye\n\n"), IResult::Done(&b""[..], Quit(Some("bye-bye".to_string())))); |
239 assert_eq!(message(b"QUIT\nbye-bye\n\n"), Ok((&b""[..], Quit(Some("bye-bye".to_string()))))); |
236 assert_eq!(message(b"QUIT\n\n"), IResult::Done(&b""[..], Quit(None))); |
240 assert_eq!(message(b"QUIT\n\n"), Ok((&b""[..], Quit(None)))); |
237 assert_eq!(message(b"CMD\nwatch demo\n\n"), IResult::Done(&b""[..], Watch("demo".to_string()))); |
241 assert_eq!(message(b"CMD\nwatch demo\n\n"), Ok((&b""[..], Watch("demo".to_string())))); |
238 assert_eq!(message(b"BAN\nme\nbad\n77\n\n"), IResult::Done(&b""[..], Ban("me".to_string(), "bad".to_string(), 77))); |
242 assert_eq!(message(b"BAN\nme\nbad\n77\n\n"), Ok((&b""[..], Ban("me".to_string(), "bad".to_string(), 77)))); |
239 |
243 |
240 assert_eq!(message(b"CMD\nPART\n\n"), IResult::Done(&b""[..], Part(None))); |
244 assert_eq!(message(b"CMD\nPART\n\n"), Ok((&b""[..], Part(None)))); |
241 assert_eq!(message(b"CMD\nPART _msg_\n\n"), IResult::Done(&b""[..], Part(Some("_msg_".to_string())))); |
245 assert_eq!(message(b"CMD\nPART _msg_\n\n"), Ok((&b""[..], Part(Some("_msg_".to_string()))))); |
242 |
246 |
243 assert_eq!(message(b"CMD\nRND\n\n"), IResult::Done(&b""[..], Rnd(vec![]))); |
247 assert_eq!(message(b"CMD\nRND\n\n"), Ok((&b""[..], Rnd(vec![])))); |
244 assert_eq!( |
248 assert_eq!( |
245 message(b"CMD\nRND A B\n\n"), |
249 message(b"CMD\nRND A B\n\n"), |
246 IResult::Done(&b""[..], Rnd(vec![String::from("A"), String::from("B")])) |
250 Ok((&b""[..], Rnd(vec![String::from("A"), String::from("B")]))) |
247 ); |
251 ); |
248 |
252 |
249 assert_eq!(extract_messages(b"QUIT\n1\n2\n\n"), IResult::Done(&b""[..], vec![Malformed])); |
253 assert_eq!(extract_messages(b"QUIT\n1\n2\n\n"), Ok((&b""[..], vec![Malformed]))); |
250 |
254 |
251 assert_eq!(extract_messages(b"PING\n\nPING\n\nP"), IResult::Done(&b"P"[..], vec![Ping, Ping])); |
255 assert_eq!(extract_messages(b"PING\n\nPING\n\nP"), Ok((&b"P"[..], vec![Ping, Ping]))); |
252 assert_eq!(extract_messages(b"SING\n\nPING\n\n"), IResult::Done(&b""[..], vec![Malformed, Ping])); |
256 assert_eq!(extract_messages(b"SING\n\nPING\n\n"), Ok((&b""[..], vec![Malformed, Ping]))); |
253 assert_eq!(extract_messages(b"\n\n\n\nPING\n\n"), IResult::Done(&b""[..], vec![Empty, Empty, Ping])); |
257 assert_eq!(extract_messages(b"\n\n\n\nPING\n\n"), Ok((&b""[..], vec![Empty, Empty, Ping]))); |
254 assert_eq!(extract_messages(b"\n\n\nPING\n\n"), IResult::Done(&b""[..], vec![Empty, Empty, Ping])); |
258 assert_eq!(extract_messages(b"\n\n\nPING\n\n"), Ok((&b""[..], vec![Empty, Empty, Ping]))); |
255 } |
259 } |