mirror of
https://github.com/Noratrieb/advent-of-code.git
synced 2026-01-14 17:45:02 +01:00
cleanup
This commit is contained in:
parent
a039fddf85
commit
d95881c5cf
5 changed files with 13 additions and 8 deletions
|
|
@ -7,3 +7,4 @@ edition = "2021"
|
|||
|
||||
[dependencies]
|
||||
nom.workspace = true
|
||||
helper.workspace = true
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
use nom::{
|
||||
branch::alt,
|
||||
bytes::complete::tag,
|
||||
character::complete::digit1,
|
||||
combinator::{all_consuming, map},
|
||||
multi::separated_list0,
|
||||
sequence::{preceded, tuple},
|
||||
|
|
@ -40,16 +39,11 @@ fn parse_line(line: &str) -> (u64, Vec<Vec<(u64, Color)>>) {
|
|||
map(tag("green"), |_| Color::Green),
|
||||
))(i)
|
||||
};
|
||||
let parse_cubes = map(
|
||||
tuple((digit1, preceded(tag(" "), parse_color))),
|
||||
|(a, c)| (a.parse::<u64>().unwrap(), c),
|
||||
);
|
||||
let parse_cubes = tuple((helper::integer, preceded(tag(" "), parse_color)));
|
||||
let parse_round = separated_list0(tag(", "), parse_cubes);
|
||||
let parse_game = separated_list0(tag("; "), parse_round);
|
||||
let parse_line = tuple((
|
||||
map(preceded(tag("Game "), digit1), |d: &str| {
|
||||
d.parse::<u64>().unwrap()
|
||||
}),
|
||||
preceded(tag("Game "), helper::integer),
|
||||
preceded(tag(": "), parse_game),
|
||||
));
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue