From 62bb12cb19f9aa60efc911bf5934dcf70ec87904 Mon Sep 17 00:00:00 2001 From: Tristan Guichaoua <33934311+tguichaoua@users.noreply.github.com> Date: Wed, 6 Dec 2023 12:40:46 +0100 Subject: [PATCH] refactor: dry `solution!` macro implementation (#48) --- src/template/mod.rs | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/src/template/mod.rs b/src/template/mod.rs index 49402b2..837fe97 100644 --- a/src/template/mod.rs +++ b/src/template/mod.rs @@ -39,34 +39,23 @@ pub fn read_file_part(folder: &str, day: Day, part: u8) -> String { #[macro_export] macro_rules! solution { ($day:expr) => { - /// The current day. - const DAY: advent_of_code::template::Day = advent_of_code::day!($day); - - fn main() { - use advent_of_code::template::runner::*; - let input = advent_of_code::template::read_file("inputs", DAY); - run_part(part_one, &input, DAY, 1); - run_part(part_two, &input, DAY, 2); - } + $crate::solution!(@impl $day, [part_one, 1] [part_two, 2]); }; ($day:expr, 1) => { - /// Allows solving part one in isolation - const DAY: advent_of_code::template::Day = advent_of_code::day!($day); - - fn main() { - use advent_of_code::template::runner::*; - let input = advent_of_code::template::read_file("inputs", DAY); - run_part(part_one, &input, DAY, 1); - } + $crate::solution!(@impl $day, [part_one, 1]); }; ($day:expr, 2) => { - /// Allows solving part two in isolation - const DAY: advent_of_code::template::Day = advent_of_code::day!($day); + $crate::solution!(@impl $day, [part_two, 2]); + }; + + (@impl $day:expr, $( [$func:expr, $part:expr] )*) => { + /// The current day. + const DAY: $crate::template::Day = $crate::day!($day); fn main() { - use advent_of_code::template::runner::*; - let input = advent_of_code::template::read_file("inputs", DAY); - run_part(part_two, &input, DAY, 2); + use $crate::template::runner::*; + let input = $crate::template::read_file("inputs", DAY); + $( run_part($func, &input, DAY, $part); )* } }; }