ggriffiniii/aoc
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

rename some fn's

Browse Source
This commit is contained in:
Glenn Griffin 2020-12-18 21:58:49 -08:00
parent 62601e0782
commit 2448b9a538
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/day18.rs
View File

@ -12,20 +12,18 @@ fn num(i: &str) -> IResult<&str, usize> {
map_res(delimited(space0, digit1, space0), FromStr::from_str)(i) map_res(delimited(space0, digit1, space0), FromStr::from_str)(i)
} }
fn paren_expr(i: &str) -> IResult<&str, usize> { fn paren(i: &str) -> IResult<&str, usize> {
delimited(space0, delimited(tag("("), expr, tag(")")), space0)(i) delimited(space0, delimited(tag("("), expr, tag(")")), space0)(i)
} }
fn num_or_paren_expr(i: &str) -> IResult<&str, usize> { fn num_or_paren(i: &str) -> IResult<&str, usize> {
alt((num, paren_expr))(i) alt((num, paren))(i)
} }
fn add_or_paren(i: &str) -> IResult<&str, usize> { fn add_or_paren(i: &str) -> IResult<&str, usize> {
let (i, lhs) = num_or_paren_expr(i)?; let (i, lhs) = num_or_paren(i)?;
fold_many0(preceded(char('+'), num_or_paren_expr), lhs, |lhs, rhs| { fold_many0(preceded(char('+'), num_or_paren), lhs, |lhs, rhs| lhs + rhs)(i)
lhs + rhs
})(i)
} }
fn expr(i: &str) -> IResult<&str, usize> { fn expr(i: &str) -> IResult<&str, usize> {