src/parser/greater_block.rs

@@ -5,21 +5,22 @@ use nom::character::complete::anychar;
 use nom::character::complete::line_ending;
 use nom::character::complete::space0;
 use nom::character::complete::space1;
+use nom::combinator::consumed;
 use nom::combinator::eof;
 use nom::combinator::not;
 use nom::combinator::opt;
 use nom::combinator::peek;
 use nom::combinator::recognize;
 use nom::combinator::verify;
+use nom::multi::many0;
 use nom::multi::many_till;
+use nom::sequence::preceded;
 use nom::sequence::tuple;
 
 use super::affiliated_keyword::parse_affiliated_keywords;
 use super::org_source::OrgSource;
-use super::paragraph::empty_paragraph;
 use super::util::in_section;
 use super::util::maybe_consume_trailing_whitespace_if_not_exiting;
-use crate::context::bind_context;
 use crate::context::parser_with_context;
 use crate::context::ContextElement;
 use crate::context::ContextMatcher;
@@ -36,6 +37,7 @@ use crate::parser::util::start_of_line;
 use crate::types::CenterBlock;
 use crate::types::Element;
 use crate::types::Keyword;
+use crate::types::Paragraph;
 use crate::types::QuoteBlock;
 use crate::types::SpecialBlock;
 
@@ -100,7 +102,7 @@ fn center_block<'b, 'g, 'r, 's, AK>(
 where
     AK: IntoIterator<Item = Keyword<'s>>,
 {
-    let (remaining, body) = greater_block_body(
+    let (remaining, (source, children)) = greater_block_body(
         context,
         input,
         pre_affiliated_keywords_input,
@@ -110,14 +112,12 @@ where
     Ok((
         remaining,
         Element::CenterBlock(CenterBlock {
-            source: body.source,
+            source,
             affiliated_keywords: parse_affiliated_keywords(
                 context.get_global_settings(),
                 affiliated_keywords,
             ),
-            children: body.children,
+            children,
-            contents: body.contents,
-            post_blank: body.post_blank,
         }),
     ))
 }
@@ -135,7 +135,7 @@ fn quote_block<'b, 'g, 'r, 's, AK>(
 where
     AK: IntoIterator<Item = Keyword<'s>>,
 {
-    let (remaining, body) = greater_block_body(
+    let (remaining, (source, children)) = greater_block_body(
         context,
         input,
         pre_affiliated_keywords_input,
@@ -145,14 +145,12 @@ where
     Ok((
         remaining,
         Element::QuoteBlock(QuoteBlock {
-            source: body.source,
+            source,
             affiliated_keywords: parse_affiliated_keywords(
                 context.get_global_settings(),
                 affiliated_keywords,
             ),
-            children: body.children,
+            children,
-            contents: body.contents,
-            post_blank: body.post_blank,
         }),
     ))
 }
@@ -198,7 +196,7 @@ where
     AK: IntoIterator<Item = Keyword<'s>>,
 {
     let (remaining, parameters) = opt(tuple((space1, parameters)))(input)?;
-    let (remaining, body) = greater_block_body(
+    let (remaining, (source, children)) = greater_block_body(
         context,
         remaining,
         pre_affiliated_keywords_input,
@@ -208,28 +206,18 @@ where
     Ok((
         remaining,
         Element::SpecialBlock(SpecialBlock {
-            source: body.source,
+            source,
             affiliated_keywords: parse_affiliated_keywords(
                 context.get_global_settings(),
                 affiliated_keywords,
             ),
-            children: body.children,
+            children,
             block_type: name,
             parameters: parameters.map(|(_, parameters)| Into::<&str>::into(parameters)),
-            contents: body.contents,
-            post_blank: body.post_blank,
         }),
     ))
 }
 
-#[derive(Debug)]
-struct GreaterBlockBody<'s> {
-    source: &'s str,
-    children: Vec<Element<'s>>,
-    contents: Option<&'s str>,
-    post_blank: Option<&'s str>,
-}
-
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(ret, level = "debug", skip(context))
@@ -240,7 +228,7 @@ fn greater_block_body<'c, 'b, 'g, 'r, 's>(
     pre_affiliated_keywords_input: OrgSource<'s>,
     name: &'c str,
     context_name: &'c str,
-) -> Res<OrgSource<'s>, GreaterBlockBody<'s>> {
+) -> Res<OrgSource<'s>, (&'s str, Vec<Element<'s>>)> {
     if in_section(context, context_name) {
         return Err(nom::Err::Error(CustomError::Static(
             "Cannot nest objects of the same element",
@@ -262,43 +250,28 @@ fn greater_block_body<'c, 'b, 'g, 'r, 's>(
     let element_matcher = parser_with_context!(element(true))(&parser_context);
     let exit_matcher = parser_with_context!(exit_matcher_parser)(&parser_context);
     not(exit_matcher)(remaining)?;
-    let contents_begin = remaining;
+    let (remaining, leading_blank_lines) = opt(consumed(tuple((
-
+        blank_line,
-    let blank_line_context = ContextElement::ExitMatcherNode(ExitMatcherNode {
+        many0(preceded(not(exit_matcher), blank_line)),
-        class: ExitClass::Alpha,
+    ))))(remaining)?;
-        exit_matcher: &leading_blank_lines_end,
+    let leading_blank_lines =
-    });
+        leading_blank_lines.map(|(source, (first_line, _remaining_lines))| {
-    let blank_line_context = parser_context.with_additional_node(&blank_line_context);
+            Element::Paragraph(Paragraph::of_text(source.into(), first_line.into()))
-
+        });
-    let (remaining, leading_blank_lines) =
-        opt(bind_context!(empty_paragraph, &blank_line_context))(remaining)?;
     let (remaining, (mut children, _exit_contents)) =
         many_till(element_matcher, exit_matcher)(remaining)?;
     if let Some(lines) = leading_blank_lines {
-        children.insert(0, Element::Paragraph(lines));
+        children.insert(0, lines);
     }
-    let contents = get_consumed(contents_begin, remaining);
 
     let (remaining, _end) = exit_with_name(&parser_context, remaining)?;
 
     // Not checking if parent exit matcher is causing exit because the greater_block_end matcher asserts we matched a full greater block
 
-    let (remaining, post_blank) =
+    let (remaining, _trailing_ws) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(pre_affiliated_keywords_input, remaining);
-    Ok((
+    Ok((remaining, (Into::<&str>::into(source), children)))
-        remaining,
-        GreaterBlockBody {
-            source: Into::<&str>::into(source),
-            children,
-            contents: if contents.len() > 0 {
-                Some(Into::<&str>::into(contents))
-            } else {
-                None
-            },
-            post_blank: post_blank.map(Into::<&str>::into),
-        },
-    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
@@ -334,14 +307,3 @@ fn _greater_block_end<'b, 'g, 'r, 's, 'c>(
     let source = get_consumed(input, remaining);
     Ok((remaining, source))
 }
-
-#[cfg_attr(
-    feature = "tracing",
-    tracing::instrument(ret, level = "debug", skip(_context))
-)]
-fn leading_blank_lines_end<'b, 'g, 'r, 's, 'c>(
-    _context: RefContext<'b, 'g, 'r, 's>,
-    input: OrgSource<'s>,
-) -> Res<OrgSource<'s>, OrgSource<'s>> {
-    recognize(not(blank_line))(input)
-}

src/types/greater_element.rs

@@ -56,8 +56,6 @@ pub struct CenterBlock<'s> {
     pub source: &'s str,
     pub affiliated_keywords: AffiliatedKeywords<'s>,
     pub children: Vec<Element<'s>>,
-    pub contents: Option<&'s str>,
-    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -65,8 +63,6 @@ pub struct QuoteBlock<'s> {
     pub source: &'s str,
     pub affiliated_keywords: AffiliatedKeywords<'s>,
     pub children: Vec<Element<'s>>,
-    pub contents: Option<&'s str>,
-    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -76,8 +72,6 @@ pub struct SpecialBlock<'s> {
     pub block_type: &'s str,
     pub parameters: Option<&'s str>,
     pub children: Vec<Element<'s>>,
-    pub contents: Option<&'s str>,
-    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -186,15 +180,11 @@ impl<'s> StandardProperties<'s> for CenterBlock<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        self.contents
+        todo!()
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        self.post_blank
+        todo!()
-            .map(|text| text.lines().count())
-            .unwrap_or(0)
-            .try_into()
-            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 
@@ -204,15 +194,11 @@ impl<'s> StandardProperties<'s> for QuoteBlock<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        self.contents
+        todo!()
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        self.post_blank
+        todo!()
-            .map(|text| text.lines().count())
-            .unwrap_or(0)
-            .try_into()
-            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 
@@ -222,15 +208,11 @@ impl<'s> StandardProperties<'s> for SpecialBlock<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        self.contents
+        todo!()
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        self.post_blank
+        todo!()
-            .map(|text| text.lines().count())
-            .unwrap_or(0)
-            .try_into()
-            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }