From 8695d32f40aa3fa65377e2e98ec50ff0b166f20d Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Sun, 30 Oct 2022 05:06:06 -0400
Subject: [PATCH] Swap in the new TestContext everywhere.

---
 src/parser/nom_context.rs         |  2 +-
 src/parser/text.rs                |  8 ++++++--
 src/parser/text_element_parser.rs | 13 +++++++++----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/parser/nom_context.rs b/src/parser/nom_context.rs
index 40486f37..3e0bdac6 100644
--- a/src/parser/nom_context.rs
+++ b/src/parser/nom_context.rs
@@ -18,7 +18,7 @@ struct ContextLayer<T> {
     parent: ContextReference<T>,
 }
 
-struct ContextData {
+pub struct ContextData {
     fail_matcher: ChainBehavior,
 }
 
diff --git a/src/parser/text.rs b/src/parser/text.rs
index fb9d7edb..28f7dd62 100644
--- a/src/parser/text.rs
+++ b/src/parser/text.rs
@@ -27,6 +27,7 @@ use nom::sequence::tuple;
 use nom::IResult;
 
 use super::nom_context::NomContext;
+use super::nom_context::TestContext;
 use super::parser_with_context::parser_with_context;
 use super::text_element_parser::paragraph;
 
@@ -137,7 +138,10 @@ pub fn paragraph_end(input: &str) -> Res<&str, &str> {
 }
 
 pub fn document(input: &str) -> Res<&str, Vec<(Vec<TextElement>, &str)>> {
-    let initial_context = NomContext::new(Rc::new(RefCell::new(paragraph_end)));
-    let ret = many1(parser_with_context!(paragraph)(&initial_context))(input);
+    let initial_context = TestContext::new();
+    let paragraph_context =
+        initial_context.with_additional_fail_matcher(Rc::new(RefCell::new(paragraph_end)));
+    // let initial_context = NomContext::new(Rc::new(RefCell::new(paragraph_end)));
+    let ret = many1(parser_with_context!(paragraph)(&paragraph_context))(input);
     ret
 }
diff --git a/src/parser/text_element_parser.rs b/src/parser/text_element_parser.rs
index c2b888ff..ab10cad8 100644
--- a/src/parser/text_element_parser.rs
+++ b/src/parser/text_element_parser.rs
@@ -5,7 +5,9 @@ use std::rc::Rc;
 use crate::parser::parser_with_context::parser_with_context;
 use crate::parser::text::paragraph_end;
 
+use super::nom_context::ContextData;
 use super::nom_context::NomContext;
+use super::nom_context::TestContext;
 use super::text::bold_end;
 use super::text::bold_start;
 use super::text::line_break;
@@ -24,8 +26,11 @@ use nom::multi::many_till;
 use nom::sequence::tuple;
 use nom::IResult;
 
-fn flat_text_element<'s, 'r>(i: &'s str, context: &'r NomContext) -> Res<&'s str, TextElement<'s>> {
-    context.not_matching_fail(i)?;
+fn flat_text_element<'s, 'r>(
+    i: &'s str,
+    context: &'r TestContext<ContextData>,
+) -> Res<&'s str, TextElement<'s>> {
+    // context.not_matching_fail(i)?;
 
     alt((
         map(span, TextElement::Span),
@@ -37,14 +42,14 @@ fn flat_text_element<'s, 'r>(i: &'s str, context: &'r NomContext) -> Res<&'s str
     ))(i)
 }
 
-fn flat_bold<'s, 'r>(i: &'s str, context: &'r NomContext) -> Res<&'s str, TextElement<'s>> {
+fn flat_bold<'s, 'r>(i: &'s str, context: &'r TestContext<ContextData>) -> Res<&'s str, TextElement<'s>> {
     // let new_context = context.without_bold(Rc::new(RefCell::new(recognize(bold_end))));
     todo!()
 }
 
 pub fn paragraph<'s, 'r>(
     i: &'s str,
-    context: &'r NomContext,
+    context: &'r TestContext<ContextData>,
 ) -> Res<&'s str, (Vec<TextElement<'s>>, &'s str)> {
     let text_element_parser = parser_with_context!(flat_text_element)(context);
     many_till(text_element_parser, paragraph_end)(i)