Move over the rest of the types.

src/lib.rs

@@ -18,4 +18,4 @@ pub use compare::get_org_mode_version;
 mod context;
 mod error;
 pub mod parser;
-mod types;
+pub mod types;

src/parser/angle_link.rs

@@ -6,12 +6,7 @@ use nom::multi::many_till;
 
 use super::org_source::OrgSource;
 use super::util::maybe_consume_object_trailing_whitespace_if_not_exiting;
-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_link::protocol;
 use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;

src/parser/citation.rs

@@ -14,17 +14,12 @@ use super::citation_reference::must_balance_bracket;
 use super::org_source::BracketDepth;
 use super::org_source::OrgSource;
 use super::util::maybe_consume_object_trailing_whitespace_if_not_exiting;
-use super::Context;
 use crate::error::CustomError;
 use crate::error::Res;
 use crate::parser::citation_reference::citation_reference;
 use crate::parser::citation_reference::citation_reference_key;
-use crate::parser::exiting::ExitClass;
 use crate::parser::object::Citation;
 use crate::parser::object_parser::standard_set_object;
-use crate::parser::parser_context::ContextElement;
-use crate::parser::parser_context::ExitMatcherNode;
-use crate::parser::parser_with_context::parser_with_context;
 use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;
 use crate::parser::Object;

src/parser/citation_reference.rs

@@ -12,16 +12,11 @@ use nom::sequence::tuple;
 
 use super::org_source::BracketDepth;
 use super::org_source::OrgSource;
-use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
 use crate::error::Res;
-use crate::parser::exiting::ExitClass;
 use crate::parser::object::CitationReference;
 use crate::parser::object_parser::minimal_set_object;
-use crate::parser::parser_context::ContextElement;
-use crate::parser::parser_context::ExitMatcherNode;
-use crate::parser::parser_with_context::parser_with_context;
 use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;
 use crate::parser::util::WORD_CONSTITUENT_CHARACTERS;

src/parser/clock.rs

@@ -12,9 +12,7 @@ use nom::combinator::verify;
 use nom::sequence::tuple;
 
 use super::org_source::OrgSource;
-use super::Context;
 use crate::error::Res;
-use crate::parser::parser_with_context::parser_with_context;
 use crate::parser::util::get_consumed;
 use crate::parser::util::start_of_line;
 use crate::parser::Clock;

src/parser/comment.rs

@@ -13,12 +13,9 @@ use nom::sequence::tuple;
 
 use super::org_source::OrgSource;
 use super::util::get_consumed;
-use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
 use crate::error::Res;
-use crate::parser::parser_context::ContextElement;
-use crate::parser::parser_with_context::parser_with_context;
 use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::immediate_in_section;
 use crate::parser::util::start_of_line;

src/parser/diary_sexp.rs

@@ -11,7 +11,6 @@ use nom::sequence::tuple;
 
 use super::org_source::OrgSource;
 use super::sexp::sexp;
-use super::Context;
 use crate::error::Res;
 use crate::parser::util::get_consumed;
 use crate::parser::util::start_of_line;

src/parser/document.rs

@@ -18,87 +18,23 @@ use nom::multi::separated_list1;
 use nom::sequence::tuple;
 
 use super::element::Element;
-use super::list::List;
 use super::object::Object;
 use super::org_source::convert_error;
 use super::org_source::OrgSource;
-use super::parser_with_context::parser_with_context;
-use super::source::Source;
 use super::token::AllTokensIterator;
 use super::token::Token;
 use super::util::exit_matcher_parser;
 use super::util::get_consumed;
 use super::util::start_of_line;
-use super::Context;
 use crate::error::Res;
 use crate::parser::comment::comment;
 use crate::parser::element_parser::element;
-use crate::parser::exiting::ExitClass;
 use crate::parser::object_parser::standard_set_object;
-use crate::parser::parser_context::ContextElement;
-use crate::parser::parser_context::ExitMatcherNode;
 use crate::parser::planning::planning;
 use crate::parser::property_drawer::property_drawer;
 use crate::parser::util::blank_line;
 use crate::parser::util::maybe_consume_trailing_whitespace_if_not_exiting;
 
-#[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 stars: usize,
-    pub todo_keyword: Option<&'s str>,
-    // TODO: add todo-type enum
-    pub title: Vec<Object<'s>>,
-    pub tags: Vec<&'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,
-        }
-    }
-}
-
-impl<'s> Source<'s> for Section<'s> {
-    fn get_source(&'s self) -> &'s str {
-        self.source
-    }
-}
-
-impl<'s> Source<'s> for Heading<'s> {
-    fn get_source(&'s self) -> &'s str {
-        self.source
-    }
-}
-
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 #[allow(dead_code)]
 pub fn document(input: &str) -> Res<&str, Document> {

src/parser/drawer.rs

@@ -11,16 +11,10 @@ use nom::multi::many_till;
 use nom::sequence::tuple;
 
 use super::org_source::OrgSource;
-use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
 use crate::error::Res;
 use crate::parser::element_parser::element;
-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::source::SetSource;
 use crate::parser::util::blank_line;
 use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;

src/parser/dynamic_block.rs

@@ -12,18 +12,12 @@ use nom::multi::many_till;
 use nom::sequence::tuple;
 
 use super::org_source::OrgSource;
-use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
 use crate::error::Res;
 use crate::parser::element_parser::element;
-use crate::parser::exiting::ExitClass;
 use crate::parser::greater_element::DynamicBlock;
 use crate::parser::lesser_element::Paragraph;
-use crate::parser::parser_context::ContextElement;
-use crate::parser::parser_context::ExitMatcherNode;
-use crate::parser::parser_with_context::parser_with_context;
-use crate::parser::source::SetSource;
 use crate::parser::util::blank_line;
 use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;

src/parser/element_parser.rs

@@ -24,14 +24,11 @@ use super::org_source::OrgSource;
 use super::paragraph::paragraph;
 use super::plain_list::detect_plain_list;
 use super::plain_list::plain_list;
-use super::source::SetSource;
 use super::util::get_consumed;
 use super::util::maybe_consume_trailing_whitespace_if_not_exiting;
-use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
 use crate::error::Res;
-use crate::parser::parser_with_context::parser_with_context;
 use crate::parser::table::org_mode_table;
 
 pub const fn element(

src/parser/entity.rs

@@ -8,7 +8,6 @@ use nom::combinator::recognize;
 
 use super::org_source::OrgSource;
 use super::util::maybe_consume_object_trailing_whitespace_if_not_exiting;
-use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
 use crate::error::Res;

src/parser/export_snippet.rs

@@ -9,12 +9,7 @@ use nom::sequence::tuple;
 
 use super::org_source::OrgSource;
 use super::util::maybe_consume_object_trailing_whitespace_if_not_exiting;
-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::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;
 use crate::parser::ExportSnippet;

src/parser/fixed_width_area.rs

@@ -12,9 +12,7 @@ use nom::sequence::preceded;
 use nom::sequence::tuple;
 
 use super::org_source::OrgSource;
-use super::Context;
 use crate::error::Res;
-use crate::parser::parser_with_context::parser_with_context;
 use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;
 use crate::parser::util::start_of_line;

src/parser/footnote_definition.rs

@@ -12,16 +12,11 @@ use nom::sequence::tuple;
 
 use super::org_source::OrgSource;
 use super::util::WORD_CONSTITUENT_CHARACTERS;
-use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
 use crate::error::Res;
 use crate::parser::element_parser::element;
-use crate::parser::exiting::ExitClass;
 use crate::parser::greater_element::FootnoteDefinition;
-use crate::parser::parser_context::ContextElement;
-use crate::parser::parser_context::ExitMatcherNode;
-use crate::parser::parser_with_context::parser_with_context;
 use crate::parser::util::blank_line;
 use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;

src/parser/footnote_reference.rs

@@ -6,17 +6,12 @@ use nom::multi::many_till;
 
 use super::org_source::BracketDepth;
 use super::org_source::OrgSource;
-use super::parser_context::ContextElement;
 use super::util::maybe_consume_object_trailing_whitespace_if_not_exiting;
-use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
 use crate::error::Res;
-use crate::parser::exiting::ExitClass;
 use crate::parser::footnote_definition::label;
 use crate::parser::object_parser::standard_set_object;
-use crate::parser::parser_context::ExitMatcherNode;
-use crate::parser::parser_with_context::parser_with_context;
 use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;
 use crate::parser::FootnoteReference;

src/parser/greater_block.rs

@@ -13,17 +13,11 @@ use nom::sequence::tuple;
 
 use super::org_source::OrgSource;
 use super::util::in_section;
-use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
 use crate::error::Res;
 use crate::parser::element_parser::element;
-use crate::parser::exiting::ExitClass;
 use crate::parser::greater_element::GreaterBlock;
-use crate::parser::parser_context::ContextElement;
-use crate::parser::parser_context::ExitMatcherNode;
-use crate::parser::parser_with_context::parser_with_context;
-use crate::parser::source::SetSource;
 use crate::parser::util::blank_line;
 use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;

src/parser/horizontal_rule.rs

@@ -9,7 +9,6 @@ use nom::multi::many1_count;
 use nom::sequence::tuple;
 
 use super::org_source::OrgSource;
-use super::Context;
 use crate::error::Res;
 use crate::parser::util::start_of_line;
 use crate::parser::HorizontalRule;

src/parser/inline_babel_call.rs

@@ -12,14 +12,9 @@ use nom::multi::many_till;
 use super::org_source::BracketDepth;
 use super::org_source::OrgSource;
 use super::util::maybe_consume_object_trailing_whitespace_if_not_exiting;
-use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
 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::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;
 use crate::parser::InlineBabelCall;

src/parser/inline_source_block.rs

@@ -14,14 +14,9 @@ use tracing::span;
 use super::org_source::BracketDepth;
 use super::org_source::OrgSource;
 use super::util::maybe_consume_object_trailing_whitespace_if_not_exiting;
-use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
 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::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;
 use crate::parser::InlineSourceBlock;

src/parser/keyword.rs

@@ -16,7 +16,6 @@ use nom::sequence::tuple;
 
 use super::org_source::BracketDepth;
 use super::org_source::OrgSource;
-use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
 use crate::error::Res;

src/parser/latex_environment.rs

@@ -13,12 +13,7 @@ use nom::sequence::tuple;
 
 use super::org_source::OrgSource;
 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::util::exit_matcher_parser;
 use crate::parser::util::start_of_line;
 use crate::parser::LatexEnvironment;

src/parser/latex_fragment.rs

@@ -14,11 +14,9 @@ use nom::sequence::tuple;
 
 use super::org_source::OrgSource;
 use super::util::maybe_consume_object_trailing_whitespace_if_not_exiting;
-use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
 use crate::error::Res;
-use crate::parser::parser_with_context::parser_with_context;
 use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;
 use crate::parser::LatexFragment;

src/parser/lesser_block.rs

@@ -12,9 +12,7 @@ use nom::multi::many_till;
 use nom::sequence::tuple;
 
 use super::org_source::OrgSource;
-use super::Context;
 use crate::error::Res;
-use crate::parser::exiting::ExitClass;
 use crate::parser::lesser_element::CommentBlock;
 use crate::parser::lesser_element::ExampleBlock;
 use crate::parser::lesser_element::ExportBlock;
@@ -23,9 +21,6 @@ use crate::parser::lesser_element::VerseBlock;
 use crate::parser::object::Object;
 use crate::parser::object::PlainText;
 use crate::parser::object_parser::standard_set_object;
-use crate::parser::parser_context::ContextElement;
-use crate::parser::parser_context::ExitMatcherNode;
-use crate::parser::parser_with_context::parser_with_context;
 use crate::parser::util::blank_line;
 use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;

src/parser/line_break.rs

@@ -5,7 +5,6 @@ use nom::combinator::recognize;
 use nom::multi::many0;
 
 use super::org_source::OrgSource;
-use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
 use crate::error::Res;

src/parser/mod.rs

@@ -7,16 +7,13 @@ mod diary_sexp;
 mod document;
 mod drawer;
 mod dynamic_block;
-mod element;
 mod element_parser;
 mod entity;
-mod exiting;
 mod export_snippet;
 mod fixed_width_area;
 mod footnote_definition;
 mod footnote_reference;
 mod greater_block;
-mod greater_element;
 mod horizontal_rule;
 mod inline_babel_call;
 mod inline_source_block;
@@ -24,9 +21,7 @@ mod keyword;
 mod latex_environment;
 mod latex_fragment;
 mod lesser_block;
-mod lesser_element;
 mod line_break;
-mod object;
 mod object_parser;
 mod org_macro;
 mod org_source;
@@ -39,7 +34,6 @@ mod property_drawer;
 mod radio_link;
 mod regular_link;
 pub mod sexp;
-mod source;
 mod statistics_cookie;
 mod subscript_and_superscript;
 mod table;
@@ -49,65 +43,3 @@ mod timestamp;
 mod token;
 mod util;
 pub use document::document;
-pub use document::Document;
-pub use document::DocumentElement;
-pub use document::Heading;
-pub use document::Section;
-pub use element::Element;
-pub use greater_element::Drawer;
-pub use greater_element::DynamicBlock;
-pub use greater_element::FootnoteDefinition;
-pub use greater_element::GreaterBlock;
-pub use greater_element::PlainList;
-pub use greater_element::PlainListItem;
-pub use greater_element::PropertyDrawer;
-pub use greater_element::Table;
-pub use greater_element::TableRow;
-pub use lesser_element::Clock;
-pub use lesser_element::Comment;
-pub use lesser_element::CommentBlock;
-pub use lesser_element::DiarySexp;
-pub use lesser_element::ExampleBlock;
-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;
-pub use lesser_element::TableCell;
-pub use lesser_element::VerseBlock;
-pub use object::AngleLink;
-pub use object::Bold;
-pub use object::Citation;
-pub use object::CitationReference;
-pub use object::Code;
-pub use object::Entity;
-pub use object::ExportSnippet;
-pub use object::FootnoteReference;
-pub use object::InlineBabelCall;
-pub use object::InlineSourceBlock;
-pub use object::Italic;
-pub use object::LatexFragment;
-pub use object::LineBreak;
-pub use object::Object;
-pub use object::OrgMacro;
-pub use object::PlainLink;
-pub use object::PlainText;
-pub use object::RadioLink;
-pub use object::RadioTarget;
-pub use object::RegularLink;
-pub use object::StatisticsCookie;
-pub use object::StrikeThrough;
-pub use object::Subscript;
-pub use object::Superscript;
-pub use object::Target;
-pub use object::Timestamp;
-pub use object::Underline;
-pub use object::Verbatim;
-pub use source::Source;
-
-use self::org_source::OrgSource;
-use self::parser_context::Context;
-use crate::error::Res;

src/parser/object_parser.rs

@@ -2,7 +2,6 @@ use nom::branch::alt;
 use nom::combinator::map;
 
 use super::org_source::OrgSource;
-use super::parser_with_context::parser_with_context;
 use super::plain_text::plain_text;
 use super::regular_link::regular_link;
 use super::Context;

src/parser/org_macro.rs

@@ -13,7 +13,6 @@ use super::Context;
 use crate::error::CustomError;
 use crate::error::Res;
 use crate::parser::object::OrgMacro;
-use crate::parser::parser_with_context::parser_with_context;
 use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;
 

src/parser/org_source.rs

@@ -27,7 +27,7 @@ pub struct OrgSource<'s> {
 
 impl<'s> std::fmt::Debug for OrgSource<'s> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_tuple("OrgSource")
+        f.debug_tuple("Org")
             .field(&Into::<&str>::into(self))
             .finish()
     }

src/parser/paragraph.rs

@@ -13,11 +13,7 @@ use super::util::blank_line;
 use super::util::get_consumed;
 use super::Context;
 use crate::error::Res;
-use crate::parser::exiting::ExitClass;
 use crate::parser::object_parser::standard_set_object;
-use crate::parser::parser_context::ContextElement;
-use crate::parser::parser_context::ExitMatcherNode;
-use crate::parser::parser_with_context::parser_with_context;
 use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::start_of_line;
 

src/parser/plain_link.rs

@@ -15,11 +15,7 @@ use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
 use crate::error::Res;
-use crate::parser::exiting::ExitClass;
 use crate::parser::object::PlainLink;
-use crate::parser::parser_context::ContextElement;
-use crate::parser::parser_context::ExitMatcherNode;
-use crate::parser::parser_with_context::parser_with_context;
 use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;
 use crate::parser::util::WORD_CONSTITUENT_CHARACTERS;

src/parser/plain_list.rs

@@ -18,9 +18,7 @@ use nom::sequence::tuple;
 
 use super::greater_element::PlainList;
 use super::greater_element::PlainListItem;
-use super::object_parser::standard_set_object;
 use super::org_source::OrgSource;
-use super::parser_with_context::parser_with_context;
 use super::util::non_whitespace_character;
 use super::Context;
 use super::Object;
@@ -28,9 +26,6 @@ use crate::error::CustomError;
 use crate::error::MyError;
 use crate::error::Res;
 use crate::parser::element_parser::element;
-use crate::parser::exiting::ExitClass;
-use crate::parser::parser_context::ContextElement;
-use crate::parser::parser_context::ExitMatcherNode;
 use crate::parser::util::blank_line;
 use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;

src/parser/plain_text.rs

@@ -13,9 +13,6 @@ use super::radio_link::RematchObject;
 use super::Context;
 use super::Object;
 use crate::error::Res;
-use crate::parser::object_parser::any_object_except_plain_text;
-use crate::parser::parser_with_context::parser_with_context;
-use crate::parser::util::exit_matcher_parser;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn plain_text<'r, 's>(

src/parser/property_drawer.rs

@@ -18,13 +18,8 @@ use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
 use crate::error::Res;
-use crate::parser::exiting::ExitClass;
 use crate::parser::greater_element::NodeProperty;
 use crate::parser::greater_element::PropertyDrawer;
-use crate::parser::parser_context::ContextElement;
-use crate::parser::parser_context::ExitMatcherNode;
-use crate::parser::parser_with_context::parser_with_context;
-use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;
 use crate::parser::util::immediate_in_section;
 use crate::parser::util::maybe_consume_trailing_whitespace_if_not_exiting;

src/parser/radio_link.rs

@@ -12,12 +12,6 @@ use super::Object;
 use crate::error::CustomError;
 use crate::error::MyError;
 use crate::error::Res;
-use crate::parser::exiting::ExitClass;
-use crate::parser::object_parser::minimal_set_object;
-use crate::parser::parser_context::ContextElement;
-use crate::parser::parser_context::ExitMatcherNode;
-use crate::parser::parser_with_context::parser_with_context;
-use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;
 use crate::parser::RadioLink;
 use crate::parser::RadioTarget;

src/parser/regular_link.rs

@@ -7,18 +7,12 @@ use nom::combinator::verify;
 use nom::multi::many_till;
 
 use super::org_source::OrgSource;
-use super::parser_with_context::parser_with_context;
 use super::util::get_consumed;
 use super::util::maybe_consume_object_trailing_whitespace_if_not_exiting;
 use super::Context;
 use super::Object;
 use super::RegularLink;
 use crate::error::Res;
-use crate::parser::exiting::ExitClass;
-use crate::parser::object_parser::regular_link_description_object_set;
-use crate::parser::parser_context::ContextElement;
-use crate::parser::parser_context::ExitMatcherNode;
-use crate::parser::util::exit_matcher_parser;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn regular_link<'r, 's>(

src/parser/statistics_cookie.rs

@@ -7,7 +7,6 @@ use super::org_source::OrgSource;
 use super::util::maybe_consume_object_trailing_whitespace_if_not_exiting;
 use super::Context;
 use crate::error::Res;
-use crate::parser::parser_with_context::parser_with_context;
 use crate::parser::StatisticsCookie;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]

src/parser/subscript_and_superscript.rs

@@ -18,12 +18,6 @@ use super::Object;
 use crate::error::CustomError;
 use crate::error::MyError;
 use crate::error::Res;
-use crate::parser::exiting::ExitClass;
-use crate::parser::object_parser::standard_set_object;
-use crate::parser::parser_context::ContextElement;
-use crate::parser::parser_context::ExitMatcherNode;
-use crate::parser::parser_with_context::parser_with_context;
-use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;
 use crate::parser::Subscript;
 use crate::parser::Superscript;

src/parser/table.rs

@@ -12,17 +12,11 @@ use nom::multi::many1;
 use nom::multi::many_till;
 use nom::sequence::tuple;
 
-use super::object_parser::table_cell_set_object;
 use super::org_source::OrgSource;
 use super::Context;
 use crate::error::Res;
-use crate::parser::exiting::ExitClass;
 use crate::parser::greater_element::TableRow;
 use crate::parser::lesser_element::TableCell;
-use crate::parser::parser_context::ContextElement;
-use crate::parser::parser_context::ExitMatcherNode;
-use crate::parser::parser_with_context::parser_with_context;
-use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;
 use crate::parser::util::start_of_line;
 use crate::parser::Table;

src/parser/target.rs

@@ -12,11 +12,6 @@ use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
 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::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;
 use crate::parser::Target;
 

src/parser/text_markup.rs

@@ -22,11 +22,6 @@ use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
 use crate::error::Res;
-use crate::parser::exiting::ExitClass;
-use crate::parser::object_parser::standard_set_object;
-use crate::parser::parser_context::ContextElement;
-use crate::parser::parser_context::ExitMatcherNode;
-use crate::parser::parser_with_context::parser_with_context;
 use crate::parser::radio_link::rematch_target;
 use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;

src/parser/timestamp.rs

@@ -14,12 +14,6 @@ use super::org_source::OrgSource;
 use super::util::maybe_consume_object_trailing_whitespace_if_not_exiting;
 use super::Context;
 use crate::error::Res;
-use crate::parser::exiting::ExitClass;
-use crate::parser::parser_context::ContextElement;
-use crate::parser::parser_context::ContextTree;
-use crate::parser::parser_context::ExitMatcherNode;
-use crate::parser::parser_with_context::parser_with_context;
-use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;
 use crate::parser::Timestamp;
 

src/parser/token.rs

@@ -1,14 +1,10 @@
 use std::collections::VecDeque;
 
-use super::Document;
 use super::Element;
-use super::Heading;
 use super::Object;
 use super::PlainListItem;
-use super::Section;
 use super::TableCell;
 use super::TableRow;
-use crate::parser::DocumentElement;
 
 pub enum Token<'r, 's> {
     Document(&'r Document<'s>),

src/parser/util.rs

@@ -14,12 +14,10 @@ use nom::multi::many_till;
 use nom::sequence::tuple;
 
 use super::org_source::OrgSource;
-use super::parser_context::ContextElement;
 use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
 use crate::error::Res;
-use crate::parser::parser_with_context::parser_with_context;
 
 pub const WORD_CONSTITUENT_CHARACTERS: &str =
     "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";

src/types/document.rs

@@ -0,0 +1,56 @@
+#[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 stars: usize,
+    pub todo_keyword: Option<&'s str>,
+    // TODO: add todo-type enum
+    pub title: Vec<Object<'s>>,
+    pub tags: Vec<&'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,
+        }
+    }
+}
+
+impl<'s> Source<'s> for Section<'s> {
+    fn get_source(&'s self) -> &'s str {
+        self.source
+    }
+}
+
+impl<'s> Source<'s> for Heading<'s> {
+    fn get_source(&'s self) -> &'s str {
+        self.source
+    }
+}

src/types/element.rs

@@ -18,8 +18,6 @@ use super::lesser_element::Paragraph;
 use super::lesser_element::Planning;
 use super::lesser_element::SrcBlock;
 use super::lesser_element::VerseBlock;
-use super::source::SetSource;
-use super::source::Source;
 use super::Drawer;
 
 #[derive(Debug)]

src/types/greater_element.rs

@@ -1,6 +1,5 @@
 use super::element::Element;
 use super::lesser_element::TableCell;
-use super::source::Source;
 use super::Object;
 
 #[derive(Debug)]

src/types/lesser_element.rs

@@ -1,5 +1,4 @@
 use super::object::Object;
-use super::source::Source;
 use super::PlainText;
 
 #[derive(Debug)]

src/types/mod.rs

@@ -0,0 +1,65 @@
+mod document;
+mod element;
+mod greater_element;
+mod lesser_element;
+mod object;
+mod source;
+pub use document::Document;
+pub use document::DocumentElement;
+pub use document::Heading;
+pub use document::Section;
+pub use element::Element;
+pub use greater_element::Drawer;
+pub use greater_element::DynamicBlock;
+pub use greater_element::FootnoteDefinition;
+pub use greater_element::GreaterBlock;
+pub use greater_element::PlainList;
+pub use greater_element::PlainListItem;
+pub use greater_element::PropertyDrawer;
+pub use greater_element::Table;
+pub use greater_element::TableRow;
+pub use lesser_element::Clock;
+pub use lesser_element::Comment;
+pub use lesser_element::CommentBlock;
+pub use lesser_element::DiarySexp;
+pub use lesser_element::ExampleBlock;
+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;
+pub use lesser_element::TableCell;
+pub use lesser_element::VerseBlock;
+pub use object::AngleLink;
+pub use object::Bold;
+pub use object::Citation;
+pub use object::CitationReference;
+pub use object::Code;
+pub use object::Entity;
+pub use object::ExportSnippet;
+pub use object::FootnoteReference;
+pub use object::InlineBabelCall;
+pub use object::InlineSourceBlock;
+pub use object::Italic;
+pub use object::LatexFragment;
+pub use object::LineBreak;
+pub use object::Object;
+pub use object::OrgMacro;
+pub use object::PlainLink;
+pub use object::PlainText;
+pub use object::RadioLink;
+pub use object::RadioTarget;
+pub use object::RegularLink;
+pub use object::StatisticsCookie;
+pub use object::StrikeThrough;
+pub use object::Subscript;
+pub use object::Superscript;
+pub use object::Target;
+pub use object::Timestamp;
+pub use object::Underline;
+pub use object::Verbatim;
+pub use source::SetSource;
+pub use source::Source;

src/types/object.rs

@@ -1,5 +1,3 @@
-use super::source::Source;
-
 #[derive(Debug, PartialEq)]
 pub enum Object<'s> {
     Bold(Bold<'s>),