Introduce the document structure.

language_rules.txt

@@ -1 +0,0 @@
-Two line breaks to end paragraph except in code blocks

org_mode_samples/sections_and_headings/Makefile

@@ -0,0 +1,23 @@
+SHELL := bash
+.ONESHELL:
+.SHELLFLAGS := -eu -o pipefail -c
+.DELETE_ON_ERROR:
+MAKEFLAGS += --warn-undefined-variables
+MAKEFLAGS += --no-builtin-rules
+SRCFILES := $(wildcard *.org)
+OUTFILES := $(patsubst %.org,%.tree.txt,$(SRCFILES))
+
+ifeq ($(origin .RECIPEPREFIX), undefined)
+  $(error This Make does not support .RECIPEPREFIX. Please use GNU Make 4.0 or later)
+endif
+.RECIPEPREFIX = >
+
+.PHONY: all
+all: $(OUTFILES)
+
+.PHONY: clean
+clean:
+> rm -rf $(OUTFILES)
+
+%.tree.txt: %.org ../common.el ../dump_org_ast.bash
+> ../dump_org_ast.bash $< $@

org_mode_samples/sections_and_headings/immediate_heading.org

@@ -0,0 +1 @@
+* Start a document with an immediate heading

org_mode_samples/sections_and_headings/sections_and_headings.org

@@ -0,0 +1,7 @@
+Before the first heading
+* The first heading
+body of the first section
+** Child heading
+body of child heading
+* second top-level heading
+body of second top-level heading

src/main.rs

@@ -1,4 +1,4 @@
-use crate::parser::document;
+// use crate::parser::document;
 use tracing::Level;
 use tracing_subscriber::fmt::format::FmtSpan;
 
@@ -18,8 +18,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .with_span_events(FmtSpan::ENTER | FmtSpan::EXIT)
         .finish();
     tracing::subscriber::set_global_default(subscriber)?;
-    let parsed = document(TEST_DOC);
-    println!("{}\n\n\n", TEST_DOC);
-    println!("{:#?}", parsed);
+    // let parsed = document(TEST_DOC);
+    // println!("{}\n\n\n", TEST_DOC);
+    // println!("{:#?}", parsed);
     Ok(())
 }

src/parser/document.rs

@@ -1,29 +1,42 @@
-//! A single element of text.
-use super::combinator::context_many1;
-use super::error::Res;
-use super::paragraph::paragraph;
-use super::parser_context::ContextElement;
-use super::parser_context::ContextTree;
-use super::token::Paragraph;
-use super::token::Token;
-use super::Context;
-use nom::IResult;
+use super::element::Element;
+use super::source::Source;
 
-type UnboundMatcher<'r, 's, I, O, E> = dyn Fn(Context<'r, 's>, I) -> IResult<I, O, E>;
-
-// TODO: Implement FromStr for Document
-
-pub fn document(input: &str) -> Res<&str, Vec<Paragraph>> {
-    let initial_context: ContextTree<'_, '_> = ContextTree::new();
-    let document_context =
-        initial_context.with_additional_node(ContextElement::DocumentRoot(input));
-    let (remaining, tokens) = context_many1(&document_context, paragraph)(input)?;
-    let paragraphs = tokens
-        .into_iter()
-        .map(|token| match token {
-            Token::TextElement(_) => unreachable!(),
-            Token::Paragraph(paragraph) => paragraph,
-        })
-        .collect();
-    Ok((remaining, paragraphs))
+#[derive(Debug)]
+pub struct Document<'s> {
+    pub source: &'s str,
+    pub zeroth_section: Option<Section<'s>>,
+    pub children: Vec<Heading<'s>>,
+}
+
+#[derive(Debug)]
+pub struct Heading<'s> {
+    pub source: &'s str,
+    pub children: Vec<DocumentElement<'s>>,
+}
+
+#[derive(Debug)]
+pub struct Section<'s> {
+    pub source: &'s str,
+    pub children: Vec<Element<'s>>,
+}
+
+#[derive(Debug)]
+pub enum DocumentElement<'s> {
+    Heading(Heading<'s>),
+    Section(Section<'s>),
+}
+
+impl<'s> Source<'s> for Document<'s> {
+    fn get_source(&'s self) -> &'s str {
+        self.source
+    }
+}
+
+impl<'s> Source<'s> for DocumentElement<'s> {
+    fn get_source(&'s self) -> &'s str {
+        match self {
+            DocumentElement::Heading(obj) => obj.source,
+            DocumentElement::Section(obj) => obj.source,
+        }
+    }
 }

src/parser/element.rs

@@ -1,7 +1,18 @@
 use super::greater_element::PlainList;
 use super::lesser_element::Paragraph;
+use super::source::Source;
 
+#[derive(Debug)]
 pub enum Element<'s> {
     Paragraph(Paragraph<'s>),
     PlainList(PlainList<'s>),
 }
+
+impl<'s> Source<'s> for Element<'s> {
+    fn get_source(&'s self) -> &'s str {
+        match self {
+            Element::Paragraph(obj) => obj.source,
+            Element::PlainList(obj) => obj.source,
+        }
+    }
+}

src/parser/mod.rs

@@ -12,10 +12,10 @@ mod paragraph;
 mod parser_context;
 mod parser_with_context;
 mod plain_list;
+mod source;
 mod text;
 mod token;
 mod util;
-pub use document::document;
 type Context<'r, 's> = &'r parser_context::ContextTree<'r, 's>;
 pub use parser_context::ContextTree;
 pub use plain_list::item;

src/parser/object.rs

@@ -1,6 +1,4 @@
-pub trait Source<'s> {
-    fn get_source(&'s self) -> &'s str;
-}
+use super::source::Source;
 
 #[derive(Debug)]
 pub enum Object<'s> {

src/parser/old_document.rs

@@ -0,0 +1,29 @@
+//! A single element of text.
+use super::combinator::context_many1;
+use super::error::Res;
+use super::paragraph::paragraph;
+use super::parser_context::ContextElement;
+use super::parser_context::ContextTree;
+use super::token::Paragraph;
+use super::token::Token;
+use super::Context;
+use nom::IResult;
+
+type UnboundMatcher<'r, 's, I, O, E> = dyn Fn(Context<'r, 's>, I) -> IResult<I, O, E>;
+
+// TODO: Implement FromStr for Document
+
+pub fn document(input: &str) -> Res<&str, Vec<Paragraph>> {
+    let initial_context: ContextTree<'_, '_> = ContextTree::new();
+    let document_context =
+        initial_context.with_additional_node(ContextElement::DocumentRoot(input));
+    let (remaining, tokens) = context_many1(&document_context, paragraph)(input)?;
+    let paragraphs = tokens
+        .into_iter()
+        .map(|token| match token {
+            Token::TextElement(_) => unreachable!(),
+            Token::Paragraph(paragraph) => paragraph,
+        })
+        .collect();
+    Ok((remaining, paragraphs))
+}

src/parser/source.rs

@@ -0,0 +1,3 @@
+pub trait Source<'s> {
+    fn get_source(&'s self) -> &'s str;
+}