Defining new structs for each type of lesser block.

src/parser/lesser_block.rs

@@ -15,8 +15,11 @@ use nom::sequence::tuple;
 use super::error::Res;
 use super::Context;
 use crate::parser::exiting::ExitClass;
-use crate::parser::lesser_element::LesserBlock;
-use crate::parser::lesser_element::LesserBlockComment;
+use crate::parser::lesser_element::CommentBlock;
+use crate::parser::lesser_element::ExampleBlock;
+use crate::parser::lesser_element::ExportBlock;
+use crate::parser::lesser_element::SrcBlock;
+use crate::parser::lesser_element::VerseBlock;
 use crate::parser::object_parser::standard_set_object;
 use crate::parser::parser_context::ContextElement;
 use crate::parser::parser_context::ExitMatcherNode;
@@ -29,10 +32,10 @@ use crate::parser::util::maybe_consume_trailing_whitespace_if_not_exiting;
 use crate::parser::util::start_of_line;
 
 #[tracing::instrument(ret, level = "debug")]
-pub fn lesser_block<'r, 's>(
+pub fn verse_block<'r, 's>(
     context: Context<'r, 's>,
     input: &'s str,
-) -> Res<&'s str, LesserBlock<'s>> {
+) -> Res<&'s str, VerseBlock<'s>> {
     start_of_line(context, input)?;
     let (remaining, _leading_whitespace) = space0(input)?;
     let (remaining, (_begin, name)) = tuple((
@@ -77,7 +80,7 @@ pub fn lesser_block<'r, 's>(
     let source = get_consumed(input, remaining);
     Ok((
         remaining,
-        LesserBlock {
+        VerseBlock {
             source,
             name,
             data: parameters,
@@ -87,10 +90,10 @@ pub fn lesser_block<'r, 's>(
 }
 
 #[tracing::instrument(ret, level = "debug")]
-pub fn lesser_block_comment<'r, 's>(
+pub fn comment_block<'r, 's>(
     context: Context<'r, 's>,
     input: &'s str,
-) -> Res<&'s str, LesserBlockComment<'s>> {
+) -> Res<&'s str, CommentBlock<'s>> {
     let (remaining, name) = lesser_block_begin("comment")(context, input)?;
     let (remaining, parameters) = opt(tuple((space1, data)))(remaining)?;
     let (remaining, _nl) = line_ending(remaining)?;
@@ -118,7 +121,127 @@ pub fn lesser_block_comment<'r, 's>(
     let source = get_consumed(input, remaining);
     Ok((
         remaining,
-        LesserBlockComment {
+        CommentBlock {
+            source,
+            name,
+            data: parameters,
+            contents,
+        },
+    ))
+}
+
+#[tracing::instrument(ret, level = "debug")]
+pub fn example_block<'r, 's>(
+    context: Context<'r, 's>,
+    input: &'s str,
+) -> Res<&'s str, ExampleBlock<'s>> {
+    let (remaining, name) = lesser_block_begin("example")(context, input)?;
+    let (remaining, parameters) = opt(tuple((space1, data)))(remaining)?;
+    let (remaining, _nl) = line_ending(remaining)?;
+    let lesser_block_end_specialized = lesser_block_end("example");
+    let parser_context = context
+        .with_additional_node(ContextElement::ConsumeTrailingWhitespace(true))
+        .with_additional_node(ContextElement::Context("lesser block"))
+        .with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
+            class: ExitClass::Beta,
+            exit_matcher: &lesser_block_end_specialized,
+        }));
+    let parameters = match parameters {
+        Some((_ws, parameters)) => Some(parameters),
+        None => None,
+    };
+
+    let (remaining, contents) = map(parser_with_context!(plain_text)(&parser_context), |obj| {
+        obj.source
+    })(remaining)?;
+    let (remaining, _end) = lesser_block_end_specialized(&parser_context, remaining)?;
+
+    let (remaining, _trailing_ws) =
+        maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
+
+    let source = get_consumed(input, remaining);
+    Ok((
+        remaining,
+        ExampleBlock {
+            source,
+            name,
+            data: parameters,
+            contents,
+        },
+    ))
+}
+
+#[tracing::instrument(ret, level = "debug")]
+pub fn export_block<'r, 's>(
+    context: Context<'r, 's>,
+    input: &'s str,
+) -> Res<&'s str, ExportBlock<'s>> {
+    let (remaining, name) = lesser_block_begin("export")(context, input)?;
+    let (remaining, parameters) = opt(tuple((space1, data)))(remaining)?;
+    let (remaining, _nl) = line_ending(remaining)?;
+    let lesser_block_end_specialized = lesser_block_end("export");
+    let parser_context = context
+        .with_additional_node(ContextElement::ConsumeTrailingWhitespace(true))
+        .with_additional_node(ContextElement::Context("lesser block"))
+        .with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
+            class: ExitClass::Beta,
+            exit_matcher: &lesser_block_end_specialized,
+        }));
+    let parameters = match parameters {
+        Some((_ws, parameters)) => Some(parameters),
+        None => None,
+    };
+
+    let (remaining, contents) = map(parser_with_context!(plain_text)(&parser_context), |obj| {
+        obj.source
+    })(remaining)?;
+    let (remaining, _end) = lesser_block_end_specialized(&parser_context, remaining)?;
+
+    let (remaining, _trailing_ws) =
+        maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
+
+    let source = get_consumed(input, remaining);
+    Ok((
+        remaining,
+        ExportBlock {
+            source,
+            name,
+            data: parameters,
+            contents,
+        },
+    ))
+}
+
+#[tracing::instrument(ret, level = "debug")]
+pub fn src_block<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, SrcBlock<'s>> {
+    let (remaining, name) = lesser_block_begin("src")(context, input)?;
+    let (remaining, parameters) = opt(tuple((space1, data)))(remaining)?;
+    let (remaining, _nl) = line_ending(remaining)?;
+    let lesser_block_end_specialized = lesser_block_end("src");
+    let parser_context = context
+        .with_additional_node(ContextElement::ConsumeTrailingWhitespace(true))
+        .with_additional_node(ContextElement::Context("lesser block"))
+        .with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
+            class: ExitClass::Beta,
+            exit_matcher: &lesser_block_end_specialized,
+        }));
+    let parameters = match parameters {
+        Some((_ws, parameters)) => Some(parameters),
+        None => None,
+    };
+
+    let (remaining, contents) = map(parser_with_context!(plain_text)(&parser_context), |obj| {
+        obj.source
+    })(remaining)?;
+    let (remaining, _end) = lesser_block_end_specialized(&parser_context, remaining)?;
+
+    let (remaining, _trailing_ws) =
+        maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
+
+    let source = get_consumed(input, remaining);
+    Ok((
+        remaining,
+        SrcBlock {
             source,
             name,
             data: parameters,