Skip to content

fix(number): allow float prefixes before non-exponent text #1889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sb123sb123 wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −9
Open

fix(number): allow float prefixes before non-exponent text #1889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/number/complete.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
use crate::branch::alt;
use crate::bytes::complete::tag;
use crate::character::complete::{char, digit1, sign};
use crate::combinator::{cut, map, opt, recognize};
use crate::combinator::{cut, eof, map, opt, recognize};
use crate::error::ErrorKind;
use crate::error::ParseError;
use crate::internal::*;
use crate::lib::std::ops::{Add, Shl};
use crate::sequence::pair;
use crate::sequence::{pair, preceded};
use crate::traits::{AsBytes, AsChar, Compare, Input, Offset};

/// Recognizes an unsigned 1 byte integer.
Expand Down Expand Up @@ -1257,7 +1257,7 @@ where
opt((
alt((char('e'), char('E'))),
opt(alt((char('+'), char('-')))),
cut(digit1)
alt((digit1, preceded(eof, cut(digit1))))
))
)).parse(input)
}
Expand Down Expand Up @@ -1842,6 +1842,8 @@ mod tests {
assert_parse!(double(test), Ok(("", expected64)));
}

assert_parse!(recognize_float("123episode"), Ok(("episode", "123")));

let remaining_exponent = "-1.234E-";
assert_parse!(
recognize_float(remaining_exponent),
Expand Down
11 changes: 8 additions & 3 deletions src/number/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ use core::{
use crate::{
branch::alt,
character::{char, digit1},
combinator::{cut, map, opt, recognize},
combinator::{cut, eof, map, opt, recognize},
error::{make_error, ErrorKind, ParseError},
sequence::pair,
sequence::{pair, preceded},
AsBytes, AsChar, Compare, Either, Emit, Err, Input, IsStreaming, Mode, Needed, Offset, OutputM,
Parser,
};
Expand Down Expand Up @@ -1317,7 +1317,7 @@ where
opt((
alt((char('e'), char('E'))),
opt(alt((char('+'), char('-')))),
cut(digit1())
alt((digit1(), preceded(eof, cut(digit1()))))
))
))
}
Expand Down Expand Up @@ -1464,6 +1464,11 @@ mod tests {
assert_parse!(double().parse_complete(test), Ok(("", expected64)));
}

assert_parse!(
recognize_float().parse_complete("123episode"),
Ok(("episode", "123"))
);

let remaining_exponent = "-1.234E-";
assert_parse!(
recognize_float().parse_complete(remaining_exponent),
Expand Down
8 changes: 5 additions & 3 deletions src/number/streaming.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
use crate::branch::alt;
use crate::bytes::streaming::tag;
use crate::character::streaming::{char, digit1, sign};
use crate::combinator::{cut, map, opt, recognize};
use crate::combinator::{cut, eof, map, opt, recognize};
use crate::error::{ErrorKind, ParseError};
use crate::lib::std::ops::{Add, Shl};
use crate::sequence::pair;
use crate::sequence::{pair, preceded};
use crate::traits::{AsBytes, AsChar, Compare, Offset};
use crate::{internal::*, Input};

Expand Down Expand Up @@ -1224,7 +1224,7 @@ where
opt((
alt((char('e'), char('E'))),
opt(alt((char('+'), char('-')))),
cut(digit1)
alt((digit1, preceded(eof, cut(digit1))))
))
)).parse(input)
}
Expand Down Expand Up @@ -1937,6 +1937,8 @@ mod tests {
assert_parse!(double(&larger[..]), Ok((";", expected64)));
}

assert_parse!(recognize_float("123episode"), Ok(("episode", "123")));

let remaining_exponent = "-1.234E-";
assert_parse!(
recognize_float(remaining_exponent),
Expand Down