openharmony/third_party_rust_nom
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_rust_nom synced 2024-11-23 07:29:54 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix property tests

Browse Source
This commit is contained in:
Geoffroy Couprie 2021-08-17 17:34:21 +02:00
parent 485147144c
commit 6cd562ebd3
2 changed files with 50 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/character/complete.rs
View File

@ -1132,10 +1132,28 @@ mod tests {
);
}
fn digit_to_i16(i: &str) -> IResult<&str, i16> {
let (i, s) = digit1(i)?;
fn digit_to_i16(input: &str) -> IResult<&str, i16> {
let i = input;
let (i, opt_sign) = opt(alt((char('+'), char('-'))))(i)?;
let sign = match opt_sign {
Some('+') => true,
Some('-') => false,
_ => true,
};
let (i, s) = match digit1::<_, crate::error::Error<_>>(i) {
Ok((i, s)) => (i, s),
Err(_) => return Err(Err::Error(crate::error::Error::from_error_kind(input, ErrorKind::Digit))),
};
match s.parse_to() {
Some(n) => Ok((i, n)),
Some(n) => {
if sign {
Ok((i, n))
} else {
Ok((i, -n))
}
},
None => Err(Err::Error(crate::error::Error::from_error_kind(i, ErrorKind::Digit))),
}
}
@ -1151,15 +1169,15 @@ mod tests {
proptest! {
#[test]
fn ints(s in "\\PC*") {
let res1 = digit_to_u32(&s);
let res2 = u32(s.as_str());
let res1 = digit_to_i16(&s);
let res2 = i16(s.as_str());
assert_eq!(res1, res2);
}
#[test]
fn uints(s in "\\PC*") {
let res1 = digit_to_i16(&s);
let res2 = i16(s.as_str());
let res1 = digit_to_u32(&s);
let res2 = u32(s.as_str());
assert_eq!(res1, res2);
}
}

32
src/character/streaming.rs
View File

@ -1105,10 +1105,28 @@ mod tests {
);
}
fn digit_to_i16(i: &str) -> IResult<&str, i16> {
let (i, s) = digit1(i)?;
fn digit_to_i16(input: &str) -> IResult<&str, i16> {
let i = input;
let (i, opt_sign) = opt(alt((char('+'), char('-'))))(i)?;
let sign = match opt_sign {
Some('+') => true,
Some('-') => false,
_ => true,
};
let (i, s) = match digit1::<_, crate::error::Error<_>>(i) {
Ok((i, s)) => (i, s),
Err(Err::Incomplete(i)) => return Err(Err::Incomplete(i)),
Err(_) => return Err(Err::Error(crate::error::Error::from_error_kind(input, ErrorKind::Digit))),
};
match s.parse_to() {
Some(n) => Ok((i, n)),
Some(n) => {
if sign {
Ok((i, n))
} else {
Ok((i, -n))
}
},
None => Err(Err::Error(crate::error::Error::from_error_kind(i, ErrorKind::Digit))),
}
}
@ -1124,15 +1142,15 @@ mod tests {
proptest! {
#[test]
fn ints(s in "\\PC*") {
let res1 = digit_to_u32(&s);
let res2 = u32(s.as_str());
let res1 = digit_to_i16(&s);
let res2 = i16(s.as_str());
assert_eq!(res1, res2);
}
#[test]
fn uints(s in "\\PC*") {
let res1 = digit_to_i16(&s);
let res2 = i16(s.as_str());
let res1 = digit_to_u32(&s);
let res2 = u32(s.as_str());
assert_eq!(res1, res2);
}
}