From ece8fcd0c441d04b2449cac6f315fa3580fb37e2 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Thu, 27 Jul 2023 20:26:56 -0400 Subject: [PATCH] Implement parser for active/inactive timestamp time ranges. --- src/parser/timestamp.rs | 72 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 67 insertions(+), 5 deletions(-) diff --git a/src/parser/timestamp.rs b/src/parser/timestamp.rs index fc21198..0ee6865 100644 --- a/src/parser/timestamp.rs +++ b/src/parser/timestamp.rs @@ -15,11 +15,11 @@ use super::Context; use crate::error::Res; use crate::parser::exiting::ExitClass; use crate::parser::parser_context::ContextElement; +use crate::parser::parser_context::ContextTree; use crate::parser::parser_context::ExitMatcherNode; use crate::parser::parser_with_context::parser_with_context; use crate::parser::util::exit_matcher_parser; use crate::parser::util::get_consumed; -use crate::parser::util::not_yet_implemented; use crate::parser::Timestamp; #[tracing::instrument(ret, level = "debug")] @@ -152,8 +152,34 @@ fn active_time_range_timestamp<'r, 's>( context: Context<'r, 's>, input: &'s str, ) -> Res<&'s str, Timestamp<'s>> { - not_yet_implemented()?; - todo!() + let (remaining, _) = tag("<")(input)?; + let (remaining, _date) = date(context, remaining)?; + let time_context = + context.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode { + class: ExitClass::Beta, + exit_matcher: &active_time_rest_end, + })); + let first_time_context = + time_context.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode { + class: ExitClass::Beta, + exit_matcher: &time_range_rest_end, + })); + let (remaining, _first_time) = + tuple((space1, parser_with_context!(time)(&first_time_context)))(remaining)?; + let (remaining, _) = tag("-")(remaining)?; + let (remaining, _second_time) = parser_with_context!(time)(&time_context)(remaining)?; + let (remaining, _repeater) = + opt(tuple((space1, parser_with_context!(repeater)(context))))(remaining)?; + let (remaining, _warning_delay) = opt(tuple(( + space1, + parser_with_context!(warning_delay)(context), + )))(remaining)?; + let (remaining, _) = tag(">")(remaining)?; + + let (remaining, _) = space0(remaining)?; + let source = get_consumed(input, remaining); + + Ok((remaining, Timestamp { source })) } #[tracing::instrument(ret, level = "debug")] @@ -177,8 +203,34 @@ fn inactive_time_range_timestamp<'r, 's>( context: Context<'r, 's>, input: &'s str, ) -> Res<&'s str, Timestamp<'s>> { - not_yet_implemented()?; - todo!() + let (remaining, _) = tag("[")(input)?; + let (remaining, _date) = date(context, remaining)?; + let time_context = + context.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode { + class: ExitClass::Beta, + exit_matcher: &inactive_time_rest_end, + })); + let first_time_context = + time_context.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode { + class: ExitClass::Beta, + exit_matcher: &time_range_rest_end, + })); + let (remaining, _first_time) = + tuple((space1, parser_with_context!(time)(&first_time_context)))(remaining)?; + let (remaining, _) = tag("-")(remaining)?; + let (remaining, _second_time) = parser_with_context!(time)(&time_context)(remaining)?; + let (remaining, _repeater) = + opt(tuple((space1, parser_with_context!(repeater)(context))))(remaining)?; + let (remaining, _warning_delay) = opt(tuple(( + space1, + parser_with_context!(warning_delay)(context), + )))(remaining)?; + let (remaining, _) = tag("]")(remaining)?; + + let (remaining, _) = space0(remaining)?; + let source = get_consumed(input, remaining); + + Ok((remaining, Timestamp { source })) } #[tracing::instrument(ret, level = "debug")] @@ -263,6 +315,16 @@ fn inactive_time_rest_end<'r, 's>( ))(input) } +#[tracing::instrument(ret, level = "debug")] +fn time_range_rest_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> { + // We pop off the most recent context element to get a context tree with just the active/inactive_time_rest_end exit matcher (removing this function from the exit matcher chain) because the 2nd time in the range does not end when a "-TIME" pattern is found. + let parent_node = context.iter().next().expect("Two context elements are added to the tree when adding this exit matcher, so it should be impossible for this to return None."); + let parent_tree = ContextTree::branch_from(parent_node); + let exit_contents = + recognize(tuple((tag("-"), parser_with_context!(time)(&parent_tree))))(input); + exit_contents +} + #[tracing::instrument(ret, level = "debug")] fn repeater<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> { // + for cumulative type