maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make string and bool parsing complete

Browse source
This commit is contained in:
Griffin Smith 2021-03-14 12:27:28 -04:00
parent 39656a3801
commit 7960c3270e
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/parser/expr.rs
View file

@ -160,8 +160,8 @@ where
named!(int(&str) -> Literal, map!(flat_map!(digit1, parse_to!(u64)), Literal::Int));
named!(bool_(&str) -> Literal, alt!(
tag!("true") => { |_| Literal::Bool(true) } |
tag!("false") => { |_| Literal::Bool(false) }
complete!(tag!("true")) => { |_| Literal::Bool(true) } |
complete!(tag!("false")) => { |_| Literal::Bool(false) }
));
fn string_internal(i: &str) -> nom::IResult<&str, Cow<'_, str>, nom::error::Error<&str>> {
@ -172,7 +172,7 @@ fn string_internal(i: &str) -> nom::IResult<&str, Cow<'_, str>, nom::error::Erro
}
named!(string(&str) -> Literal, preceded!(
char!('"'),
complete!(char!('"')),
map!(
string_internal,
|s| Literal::String(s)