mdebray/tvl-depot
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
Show stats 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)

9
src/parser/mod.rs
View file

@ -1,6 +1,6 @@
use nom::character::complete::{multispace0, multispace1};
use nom::error::{ErrorKind, ParseError};
use nom::{alt, char, complete, do_parse, many0, named, separated_list0, tag};
use nom::{alt, char, complete, do_parse, many0, named, separated_list0, tag, terminated};
#[macro_use]
mod macros;
@ -81,7 +81,7 @@ named!(pub decl(&str) -> Decl, alt!(
fun_decl
));
named!(pub toplevel(&str) -> Vec<Decl>, many0!(decl));
named!(pub toplevel(&str) -> Vec<Decl>, terminated!(many0!(decl), multispace0));
#[cfg(test)]
mod tests {
@ -114,5 +114,10 @@ mod tests {
fn main = plus (id 2) 7"
);
assert_eq!(res.len(), 3);
let res = test_parse!(
toplevel,
"fn id x = x\nfn plus x y = x + y\nfn main = plus (id 2) 7\n"
);
assert_eq!(res.len(), 3);
}
}