From 83c5a545e0831d2f9451f4c0afd5c60da1e80451 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sat, 16 Jul 2022 18:12:52 -0400 Subject: [PATCH] Deleting some extra parsers that I'll need later but they're just in the way right now. --- src/parser/bold_parser.rs | 16 ------------ src/parser/failable_sequence.rs | 45 --------------------------------- src/parser/mod.rs | 2 -- 3 files changed, 63 deletions(-) delete mode 100644 src/parser/bold_parser.rs delete mode 100644 src/parser/failable_sequence.rs diff --git a/src/parser/bold_parser.rs b/src/parser/bold_parser.rs deleted file mode 100644 index 8a8a7fd6..00000000 --- a/src/parser/bold_parser.rs +++ /dev/null @@ -1,16 +0,0 @@ -//! Text between asterisks to make it bold. -use super::failable_sequence::failable_sequence; -use super::nom_context::NomContext; -use super::text::bold_end; -use super::text::bold_start; -use super::text_element_parser::text_element; -use nom::branch::alt; -use nom::combinator::map; -use nom::combinator::not; -use nom::combinator::recognize; -use nom::error::VerboseError; -use nom::sequence::tuple; - -// Sequence - -failable_sequence!(bold, i, context, bold_start, text_element, bold_end); diff --git a/src/parser/failable_sequence.rs b/src/parser/failable_sequence.rs deleted file mode 100644 index 8e86dd52..00000000 --- a/src/parser/failable_sequence.rs +++ /dev/null @@ -1,45 +0,0 @@ -macro_rules! failable_sequence { - ($name:ident,$inp:ident,$context:ident,$begin_matcher:expr,$element_matcher:expr,$success_matcher:expr) => { - pub fn $name( - $context: &NomContext, - ) -> impl for<'a> FnMut( - &'a str, - ) -> nom::IResult< - &'a str, - crate::parser::text::Sequence<'a>, - VerboseError<&'a str>, - > { - move |$inp: &str| { - // let new_context = $context.with_no_bold(); - // // let other_new_context = NomContext::with_additional_fail_matcher( - // // |i: &str| recognize($success_matcher)(i), - // // $context, - // // ); - // // let other_new_context = - // // super::nom_context::NomContext::new($context.fail_matcher.clone()); - // let element_matcher = recognize($element_matcher(&new_context)); - // let local_fail_matcher = $context.fail_matcher.clone(); - // let ret = map( - // recognize(tuple(( - // $begin_matcher, - // nom::multi::many_till( - // nom::sequence::preceded( - // not(|i| local_fail_matcher.borrow_mut()(i)), - // element_matcher, - // ), - // nom::sequence::preceded( - // not(|i| local_fail_matcher.borrow_mut()(i)), - // $success_matcher, - // ), - // ), - // ))), - // |s: &str| crate::parser::text::Sequence { contents: s }, - // )($inp)?; - // Ok(ret) - todo!() - } - } - }; -} - -pub(crate) use failable_sequence; diff --git a/src/parser/mod.rs b/src/parser/mod.rs index a1653cdc..48fc2d88 100644 --- a/src/parser/mod.rs +++ b/src/parser/mod.rs @@ -1,5 +1,3 @@ -mod bold_parser; -mod failable_sequence; mod nom_context; mod parser_with_context; mod text;