openharmony/third_party_rust_nom
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_rust_nom synced 2025-02-18 22:58:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Realign stuff and remove warnings

Browse Source
This commit is contained in:
Geoffroy Couprie 2015-04-25 14:30:54 +02:00
parent d4f8d7ade7
commit bcaf4d3114
5 changed files with 47 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/macros.rs
View File

@ -11,7 +11,7 @@ macro_rules! closure (
#[macro_export]
macro_rules! named (
($name:ident( $i:ty ) -> $o:ty, $submac:ident!( $($args:tt)* )) => (
fn $name<'a>( i: $i ) -> IResult<'a,$i,$o> {
fn $name<'a>( i: $i ) -> $crate::IResult<'a,$i,$o> {
$submac!(i, $($args)*)
}
);
@ -26,7 +26,7 @@ macro_rules! named (
}
);
(pub $name:ident( $i:ty ) -> $o:ty, $submac:ident!( $($args:tt)* )) => (
pub fn $name<'a>( i: $i ) -> IResult<'a,$i,$o> {
pub fn $name<'a>( i: $i ) -> $crate::IResult<'a,$i,$o> {
$submac!(i, $($args)*)
}
);
@ -120,10 +120,10 @@ macro_rules! map(
($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => (
{
match $submac!($i, $($args)*) {
$crate::IResult::Error(e) => $crate::IResult::Error(e),
$crate::IResult::Error(e) => $crate::IResult::Error(e),
$crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown),
$crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size(i)),
$crate::IResult::Done(i, o) => $crate::IResult::Done(i, $submac2!(o, $($args2)*))
$crate::IResult::Done(i, o) => $crate::IResult::Done(i, $submac2!(o, $($args2)*))
}
}
);
@ -144,12 +144,12 @@ macro_rules! map_res(
($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => (
{
match $submac!($i, $($args)*) {
$crate::IResult::Error(e) => $crate::IResult::Error(e),
$crate::IResult::Error(e) => $crate::IResult::Error(e),
$crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown),
$crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size(i)),
$crate::IResult::Done(i, o) => match $submac2!(o, $($args2)*) {
$crate::IResult::Done(i, o) => match $submac2!(o, $($args2)*) {
Ok(output) => $crate::IResult::Done(i, output),
Err(_) => $crate::IResult::Error($crate::Err::Position(0, $i))
Err(_) => $crate::IResult::Error($crate::Err::Position(0,$i))
}
}
}
@ -174,9 +174,9 @@ macro_rules! map_opt(
$crate::IResult::Error(e) => $crate::IResult::Error(e),
$crate::IResult::Incomplete($crate::Needed::Unknown) => $crate::IResult::Incomplete($crate::Needed::Unknown),
$crate::IResult::Incomplete($crate::Needed::Size(i)) => $crate::IResult::Incomplete($crate::Needed::Size(i)),
$crate::IResult::Done(i, o) => match $submac2!(o, $($args2)*) {
$crate::IResult::Done(i, o) => match $submac2!(o, $($args2)*) {
Some(output) => $crate::IResult::Done(i, output),
None => $crate::IResult::Error($crate::Err::Position(0, $i))
None => $crate::IResult::Error($crate::Err::Position(0,$i))
}
}
}
@ -419,9 +419,9 @@ macro_rules! alt_parser (
($i:expr, $subrule:ident!( $args:tt ) => { $gen:expr } | $($rest:tt)+) => (
match $subrule!( $i, $args ) {
$crate::IResult::Error(_) => alt!( $i, $($rest)+ ),
$crate::IResult::Error(_) => alt!( $i, $($rest)+ ),
$crate::IResult::Incomplete(_) => alt!( $i, $($rest)+ ),
$crate::IResult::Done(i,o) => $crate::IResult::Done(i, $gen( o ))
$crate::IResult::Done(i,o) => $crate::IResult::Done(i, $gen( o ))
}
);
@ -436,8 +436,8 @@ macro_rules! alt_parser (
($i:expr, $subrule:ident!( $args:tt ) => { $gen:expr }) => (
match $subrule!( $i, $args ) {
$crate::IResult::Incomplete(x) => $crate::IResult::Incomplete(x),
$crate::IResult::Error(e) => $crate::IResult::Error(e),
$crate::IResult::Done(i,o) => $crate::IResult::Done(i, $gen( o )),
$crate::IResult::Error(e) => $crate::IResult::Error(e),
$crate::IResult::Done(i,o) => $crate::IResult::Done(i, $gen( o )),
}
);
@ -678,7 +678,7 @@ macro_rules! pair(
match $submac!($i, $($args)*) {
$crate::IResult::Error(a) => $crate::IResult::Error(a),
$crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i),
$crate::IResult::Done(i1,o1) => {
$crate::IResult::Done(i1,o1) => {
match $submac2!(i1, $($args2)*) {
$crate::IResult::Error(a) => $crate::IResult::Error(a),
$crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i),
@ -835,7 +835,7 @@ macro_rules! delimited(
match $submac!($i, $($args)*) {
$crate::IResult::Error(a) => $crate::IResult::Error(a),
$crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i),
$crate::IResult::Done(i1,_) => {
$crate::IResult::Done(i1,_) => {
delimited1!(i1, $($rest)*)
}
}
@ -853,7 +853,7 @@ macro_rules! delimited1(
match $submac2!($i, $($args2)*) {
$crate::IResult::Error(a) => $crate::IResult::Error(a),
$crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i),
$crate::IResult::Done(i2,o2) => {
$crate::IResult::Done(i2,o2) => {
delimited2!(i2, o2, $($rest)*)
}
}
@ -870,8 +870,8 @@ macro_rules! delimited2(
match $submac3!($i, $($args3)*) {
$crate::IResult::Error(a) => $crate::IResult::Error(a),
$crate::IResult::Incomplete(i) => $crate::IResult::Incomplete(i),
$crate::IResult::Done(i3,_) => {
IResult::Done(i3, $res2)
$crate::IResult::Done(i3,_) => {
$crate::IResult::Done(i3, $res2)
}
}
}
@ -1050,7 +1050,7 @@ macro_rules! many0(
begin += remaining - i.len();
remaining = i.len();
},
_ => {
_ => {
break;
}
}
@ -1155,7 +1155,7 @@ macro_rules! count(
}
);
($i:expr, $f:expr, $count: expr) => (
many0!($i, call!($f), $count);
count!($i, call!($f), $count);
);
);
/// generates a parser consuming the specified number of bytes
@ -1434,7 +1434,7 @@ macro_rules! length_value(
$crate::IResult::Error($crate::Err::Position(0,$i))
} else if res.len() < nb as usize {
match inc {
$crate::Needed::Unknown => $crate::IResult::Incomplete($crate::Needed::Unknown),
$crate::Needed::Unknown => $crate::IResult::Incomplete($crate::Needed::Unknown),
$crate::Needed::Size(_) => $crate::IResult::Incomplete($crate::Needed::Size(length_token as u32 + nb as u32 * $length))
}
} else {

11
src/producer.rs
View File

@ -267,12 +267,11 @@ macro_rules! pusher (
mod tests {
use super::*;
use internal::{Needed,IResult};
use internal::IResult::*;
use std::fmt::Debug;
fn local_print<'a,T: Debug>(input: T) -> IResult<'a,T, ()> {
println!("{:?}", input);
Done(input, ())
IResult::Done(input, ())
}
#[test]
@ -313,9 +312,9 @@ mod tests {
fn accu() {
fn f(input:&[u8]) -> IResult<&[u8],&[u8]> {
if input.len() <= 4 {
Incomplete(Needed::Size(4))
IResult::Incomplete(Needed::Size(4))
} else {
Done(b"", input)
IResult::Done(b"", input)
}
}
@ -334,9 +333,9 @@ mod tests {
fn accu_2() {
fn f(input:&[u8]) -> IResult<&[u8],&[u8]> {
if input.len() <= 4 || &input[0..5] != b"abcde" {
Incomplete(Needed::Size(4))
IResult::Incomplete(Needed::Size(4))
} else {
Done(&input[5..], &input[0..5])
IResult::Done(&input[5..], &input[0..5])
}
}

16
tests/ini.rs
View File

@ -3,8 +3,6 @@
extern crate nom;
use nom::{IResult,not_line_ending, space, alphanumeric, multispace};
use nom::IResult::*;
use nom::Err::*;
use std::str;
use std::collections::HashMap;
@ -102,7 +100,7 @@ key = value2"[..];
_ => println!("error")
}
assert_eq!(res, Done(ini_without_category, "category"));
assert_eq!(res, IResult::Done(ini_without_category, "category"));
}
#[test]
@ -119,7 +117,7 @@ key = value2"[..];
_ => println!("error")
}
assert_eq!(res, Done(ini_without_key_value, ("parameter", "value")));
assert_eq!(res, IResult::Done(ini_without_key_value, ("parameter", "value")));
}
@ -137,7 +135,7 @@ key = value2"[..];
_ => println!("error")
}
assert_eq!(res, Done(ini_without_key_value, ("parameter", "value")));
assert_eq!(res, IResult::Done(ini_without_key_value, ("parameter", "value")));
}
#[test]
@ -154,7 +152,7 @@ key = value2"[..];
_ => println!("error")
}
assert_eq!(res, Done(ini_without_key_value, ("parameter", "value")));
assert_eq!(res, IResult::Done(ini_without_key_value, ("parameter", "value")));
}
#[test]
@ -177,7 +175,7 @@ key = value2
let mut expected: HashMap<&str, &str> = HashMap::new();
expected.insert("parameter", "value");
expected.insert("key", "value2");
assert_eq!(res, Done(ini_without_key_value, expected));
assert_eq!(res, IResult::Done(ini_without_key_value, expected));
}
#[test]
@ -202,7 +200,7 @@ key = value2
let mut expected_h: HashMap<&str, &str> = HashMap::new();
expected_h.insert("parameter", "value");
expected_h.insert("key", "value2");
assert_eq!(res, Done(ini_after_parser, ("abcd", expected_h)));
assert_eq!(res, IResult::Done(ini_after_parser, ("abcd", expected_h)));
}
#[test]
@ -236,5 +234,5 @@ key4 = value4
let mut expected_h: HashMap<&str, HashMap<&str, &str>> = HashMap::new();
expected_h.insert("abcd", expected_1);
expected_h.insert("category", expected_2);
assert_eq!(res, Done(ini_after_parser, expected_h));
assert_eq!(res, IResult::Done(ini_after_parser, expected_h));
}

22
tests/omnom.rs
View File

@ -2,9 +2,7 @@
#[macro_use]
extern crate nom;
use nom::{Consumer,ConsumerState,MemProducer};
use nom::IResult::*;
use nom::Err::*;
use nom::{Consumer,ConsumerState,MemProducer,IResult};
#[derive(PartialEq,Eq,Debug)]
enum State {
@ -28,9 +26,9 @@ impl Consumer for TestConsumer {
match self.state {
State::Beginning => {
match om_parser(input) {
Error(_) => ConsumerState::ConsumerError(0),
Incomplete(_) => ConsumerState::Await(0, 2),
Done(_,_) => {
IResult::Error(_) => ConsumerState::ConsumerError(0),
IResult::Incomplete(_) => ConsumerState::Await(0, 2),
IResult::Done(_,_) => {
self.state = State::Middle;
ConsumerState::Await(2, 3)
}
@ -38,12 +36,12 @@ impl Consumer for TestConsumer {
},
State::Middle => {
match nomnom_parser(input) {
Error(_) => {
IResult::Error(_) => {
self.state = State::End;
ConsumerState::Await(0, 7)
},
Incomplete(_) => ConsumerState::Await(0, 3),
Done(i,noms_vec) => {
IResult::Incomplete(_) => ConsumerState::Await(0, 3),
IResult::Done(i,noms_vec) => {
self.counter = self.counter + noms_vec.len();
ConsumerState::Await(input.len() - i.len(), 3)
}
@ -51,9 +49,9 @@ impl Consumer for TestConsumer {
},
State::End => {
match end_parser(input) {
Error(_) => ConsumerState::ConsumerError(0),
Incomplete(_) => ConsumerState::Await(0, 7),
Done(_,_) => {
IResult::Error(_) => ConsumerState::ConsumerError(0),
IResult::Incomplete(_) => ConsumerState::Await(0, 7),
IResult::Done(_,_) => {
self.state = State::Done;
ConsumerState::ConsumerDone
}

10
tests/test1.rs
View File

@ -1,9 +1,7 @@
#[macro_use]
extern crate nom;
use nom::{IResult,FileProducer,not_line_ending};
use nom::IResult::*;
use nom::Err::*;
use nom::{IResult,Producer,FileProducer,not_line_ending};
use std::str;
use std::fmt::Debug;
@ -22,7 +20,7 @@ fn tag() {
pub fn print<'a, T: Debug>(input: T) -> IResult<'a,T,()> {
println!("{:?}", input);
Done(input, ())
IResult::Done(input, ())
}
@ -31,11 +29,11 @@ fn is_not() {
//is_not!(foo b"\r\n");
named!(foo<&[u8],&[u8]>, is_not!(&b"\r\n"[..]));
let a = &b"ab12cd\nefgh"[..];
assert_eq!(foo(a), Done(&b"\nefgh"[..], &b"ab12cd"[..]));
assert_eq!(foo(a), IResult::Done(&b"\nefgh"[..], &b"ab12cd"[..]));
}
#[test]
fn exported_public_method_defined_by_macro() {
let a = &b"ab12cd\nefgh"[..];
assert_eq!(not_line_ending(a), Done(&b"\nefgh"[..], &b"ab12cd"[..]));
assert_eq!(not_line_ending(a), IResult::Done(&b"\nefgh"[..], &b"ab12cd"[..]));
}