Merge branch 'latex_environment'

org_mode_samples/latex_environment/simple.org

@@ -0,0 +1,3 @@
+\begin{foo}
+bar
+\end{foo}

src/compare/diff.rs

@@ -18,6 +18,7 @@ use crate::parser::GreaterBlock;
 use crate::parser::Heading;
 use crate::parser::HorizontalRule;
 use crate::parser::Keyword;
+use crate::parser::LatexEnvironment;
 use crate::parser::Paragraph;
 use crate::parser::PlainList;
 use crate::parser::PlainListItem;
@@ -225,6 +226,7 @@ fn compare_element<'s>(
         Element::FixedWidthArea(obj) => compare_fixed_width_area(source, emacs, obj),
         Element::HorizontalRule(obj) => compare_horizontal_rule(source, emacs, obj),
         Element::Keyword(obj) => compare_keyword(source, emacs, obj),
+        Element::LatexEnvironment(obj) => compare_latex_environment(source, emacs, obj),
     }
 }
 
@@ -830,3 +832,27 @@ fn compare_keyword<'s>(
         children: child_status,
     })
 }
+
+fn compare_latex_environment<'s>(
+    source: &'s str,
+    emacs: &'s Token<'s>,
+    rust: &'s LatexEnvironment<'s>,
+) -> Result<DiffResult, Box<dyn std::error::Error>> {
+    let child_status = Vec::new();
+    let mut this_status = DiffStatus::Good;
+    let emacs_name = "latex-environment";
+    if assert_name(emacs, emacs_name).is_err() {
+        this_status = DiffStatus::Bad;
+    }
+
+    if assert_bounds(source, emacs, rust).is_err() {
+        this_status = DiffStatus::Bad;
+    }
+
+    Ok(DiffResult {
+        status: this_status,
+        name: emacs_name.to_owned(),
+        message: None,
+        children: child_status,
+    })
+}

src/parser/element.rs

@@ -13,6 +13,7 @@ use super::lesser_element::ExportBlock;
 use super::lesser_element::FixedWidthArea;
 use super::lesser_element::HorizontalRule;
 use super::lesser_element::Keyword;
+use super::lesser_element::LatexEnvironment;
 use super::lesser_element::Paragraph;
 use super::lesser_element::Planning;
 use super::lesser_element::SrcBlock;
@@ -43,6 +44,7 @@ pub enum Element<'s> {
     FixedWidthArea(FixedWidthArea<'s>),
     HorizontalRule(HorizontalRule<'s>),
     Keyword(Keyword<'s>),
+    LatexEnvironment(LatexEnvironment<'s>),
 }
 
 impl<'s> Source<'s> for Element<'s> {
@@ -68,6 +70,7 @@ impl<'s> Source<'s> for Element<'s> {
             Element::FixedWidthArea(obj) => obj.source,
             Element::HorizontalRule(obj) => obj.source,
             Element::Keyword(obj) => obj.source,
+            Element::LatexEnvironment(obj) => obj.source,
         }
     }
 }
@@ -96,6 +99,7 @@ impl<'s> SetSource<'s> for Element<'s> {
             Element::FixedWidthArea(obj) => obj.source = source,
             Element::HorizontalRule(obj) => obj.source = source,
             Element::Keyword(obj) => obj.source = source,
+            Element::LatexEnvironment(obj) => obj.source = source,
         }
     }
 }

src/parser/element_parser.rs

@@ -9,6 +9,7 @@ use super::footnote_definition::footnote_definition;
 use super::greater_block::greater_block;
 use super::horizontal_rule::horizontal_rule;
 use super::keyword::keyword;
+use super::latex_environment::latex_environment;
 use super::lesser_block::comment_block;
 use super::lesser_block::example_block;
 use super::lesser_block::export_block;
@@ -51,6 +52,8 @@ pub fn element(
         let horizontal_rule_matcher = parser_with_context!(horizontal_rule)(context);
         let keyword_matcher = parser_with_context!(keyword)(context);
         let paragraph_matcher = parser_with_context!(paragraph)(context);
+        let latex_environment_matcher = parser_with_context!(latex_environment)(context);
+
         let (remaining, mut affiliated_keywords) = many0(keyword_matcher)(input)?;
         let (remaining, mut element) = match alt((
             map(plain_list_matcher, Element::PlainList),
@@ -69,6 +72,7 @@ pub fn element(
             map(diary_sexp_matcher, Element::DiarySexp),
             map(fixed_width_area_matcher, Element::FixedWidthArea),
             map(horizontal_rule_matcher, Element::HorizontalRule),
+            map(latex_environment_matcher, Element::LatexEnvironment),
         ))(remaining)
         {
             the_ok @ Ok(_) => the_ok,

src/parser/latex_environment.rs

@@ -0,0 +1,75 @@
+use nom::branch::alt;
+use nom::bytes::complete::tag;
+use nom::bytes::complete::tag_no_case;
+use nom::bytes::complete::take_while1;
+use nom::character::complete::line_ending;
+use nom::character::complete::space0;
+use nom::combinator::eof;
+use nom::combinator::map;
+use nom::sequence::tuple;
+
+use super::util::get_consumed;
+use super::Context;
+use crate::error::Res;
+use crate::parser::exiting::ExitClass;
+use crate::parser::parser_context::ContextElement;
+use crate::parser::parser_context::ExitMatcherNode;
+use crate::parser::parser_with_context::parser_with_context;
+use crate::parser::plain_text::plain_text;
+use crate::parser::util::start_of_line;
+use crate::parser::LatexEnvironment;
+
+#[tracing::instrument(ret, level = "debug")]
+pub fn latex_environment<'r, 's>(
+    context: Context<'r, 's>,
+    input: &'s str,
+) -> Res<&'s str, LatexEnvironment<'s>> {
+    start_of_line(context, input)?;
+    let (remaining, _leading_whitespace) = space0(input)?;
+    let (remaining, (_opening, name, _open_close_brace, _ws, _line_ending)) = tuple((
+        tag_no_case(r#"\begin{"#),
+        name,
+        tag("}"),
+        space0,
+        line_ending,
+    ))(remaining)?;
+
+    let latex_environment_end_specialized = latex_environment_end(name);
+    let parser_context =
+        context.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
+            class: ExitClass::Beta,
+            exit_matcher: &latex_environment_end_specialized,
+        }));
+
+    let (remaining, _contents) = map(parser_with_context!(plain_text)(&parser_context), |obj| {
+        obj.source
+    })(remaining)?;
+    let (remaining, _end) = latex_environment_end_specialized(&parser_context, remaining)?;
+
+    let source = get_consumed(input, remaining);
+    Ok((remaining, LatexEnvironment { source }))
+}
+
+#[tracing::instrument(ret, level = "debug")]
+fn name<'s>(input: &'s str) -> Res<&'s str, &'s str> {
+    take_while1(|c: char| c.is_alphanumeric() || c == '*')(input)
+}
+
+fn latex_environment_end(
+    current_name: &str,
+) -> impl for<'r, 's> Fn(Context<'r, 's>, &'s str) -> Res<&'s str, &'s str> {
+    let current_name_lower = current_name.to_lowercase();
+    move |context: Context, input: &str| {
+        start_of_line(context, input)?;
+        let (remaining, _leading_whitespace) = space0(input)?;
+        let (remaining, (_begin, _name, _close_brace, _ws, _line_ending)) = tuple((
+            tag_no_case(r#"\end{"#),
+            tag_no_case(current_name_lower.as_str()),
+            tag("}"),
+            space0,
+            alt((eof, line_ending)),
+        ))(remaining)?;
+        let source = get_consumed(input, remaining);
+        Ok((remaining, source))
+    }
+}

src/parser/lesser_element.rs

@@ -89,6 +89,11 @@ pub struct Keyword<'s> {
     pub source: &'s str,
 }
 
+#[derive(Debug)]
+pub struct LatexEnvironment<'s> {
+    pub source: &'s str,
+}
+
 impl<'s> Paragraph<'s> {
     pub fn of_text(input: &'s str) -> Self {
         let mut objects = Vec::with_capacity(1);
@@ -179,3 +184,9 @@ impl<'s> Source<'s> for Keyword<'s> {
         self.source
     }
 }
+
+impl<'s> Source<'s> for LatexEnvironment<'s> {
+    fn get_source(&'s self) -> &'s str {
+        self.source
+    }
+}

src/parser/mod.rs

@@ -13,6 +13,7 @@ mod greater_block;
 mod greater_element;
 mod horizontal_rule;
 mod keyword;
+mod latex_environment;
 mod lesser_block;
 mod lesser_element;
 mod list;
@@ -53,6 +54,7 @@ pub use lesser_element::ExportBlock;
 pub use lesser_element::FixedWidthArea;
 pub use lesser_element::HorizontalRule;
 pub use lesser_element::Keyword;
+pub use lesser_element::LatexEnvironment;
 pub use lesser_element::Paragraph;
 pub use lesser_element::Planning;
 pub use lesser_element::SrcBlock;