jcgruenhage/aoc-rs-2021
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

simplify day 5 parsing

Browse source
This commit is contained in:
Jan Christian Grünhage 2021-12-12 14:30:08 +01:00
parent d73485111d
commit 933ed7a5b8
1 changed files with 10 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/day_05/parsing.rs
View file

@ -1,33 +1,19 @@
use super::model::{Line, Point}; use super::model::{Line, Point};
use crate::parsing::{newline, parse_number}; use crate::parsing::{newline, parse_n, parse_number};
use yap::{IntoTokens, Tokens}; use yap::Tokens;
pub fn parse_point(tokens: &mut impl Tokens<Item = char>) -> Option<Point> { pub fn parse_point(tokens: &mut impl Tokens<Item = char>) -> Option<Point> {
let numbers: Vec<usize> = tokens parse_n(tokens, &|t| parse_number(t), &|t| t.token(',')).map(|point: [usize; 2]| Point {
.sep_by(|t| parse_number(t), |t| t.token(',')) x: point[0],
.collect(); y: point[1],
if numbers.len() == 2 { })
Some(Point {
x: numbers[0],
y: numbers[1],
})
} else {
None
}
} }
pub fn parse_line(tokens: &mut impl Tokens<Item = char>) -> Option<Line> { pub fn parse_line(tokens: &mut impl Tokens<Item = char>) -> Option<Line> {
let points: Vec<Point> = tokens parse_n(tokens, &|t| parse_point(t), &|t| t.token(',')).map(|points: [Point; 2]| Line {
.sep_by(|t| parse_point(t), |t| t.tokens(" -> ".into_tokens())) start: points[0],
.collect(); end: points[1],
if points.len() == 2 { })
Some(Line {
start: points[0],
end: points[1],
})
} else {
None
}
} }
pub fn parse_lines(tokens: &mut impl Tokens<Item = char>) -> Vec<Line> { pub fn parse_lines(tokens: &mut impl Tokens<Item = char>) -> Vec<Line> {