talexander
/
organic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Implement the new fields for section.

This commit is contained in:
Tom Alexander 2023-10-31 23:16:57 -04:00
parent 70002800c2
commit 03754be71e
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/parser/section.rs
View File

@ -1,3 +1,4 @@
use nom::combinator::consumed;
use nom::combinator::opt; use nom::combinator::opt;
use nom::combinator::recognize; use nom::combinator::recognize;
use nom::combinator::verify; use nom::combinator::verify;
@ -58,12 +59,12 @@ pub(crate) fn zeroth_section<'b, 'g, 'r, 's>(
many0(blank_line), many0(blank_line),
)))(input)?; )))(input)?;
let (remaining, (mut children, _exit_contents)) = verify( let (remaining, (contents, (mut children, _exit_contents))) = consumed(verify(
many_till(element_matcher, exit_matcher), many_till(element_matcher, exit_matcher),
|(children, _exit_contents)| { |(children, _exit_contents)| {
!children.is_empty() || comment_and_property_drawer_element.is_some() !children.is_empty() || comment_and_property_drawer_element.is_some()
}, },
)(remaining)?; ))(remaining)?;
if let Some((comment, property_drawer, _ws)) = comment_and_property_drawer_element { if let Some((comment, property_drawer, _ws)) = comment_and_property_drawer_element {
children.insert(0, Element::PropertyDrawer(property_drawer)); children.insert(0, Element::PropertyDrawer(property_drawer));
@ -72,7 +73,7 @@ pub(crate) fn zeroth_section<'b, 'g, 'r, 's>(
} }
} }
let (remaining, _trailing_ws) = let (remaining, post_blank) =
maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?; maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
let source = get_consumed(input, remaining); let source = get_consumed(input, remaining);
@ -80,6 +81,8 @@ pub(crate) fn zeroth_section<'b, 'g, 'r, 's>(
remaining, remaining,
Section { Section {
source: source.into(), source: source.into(),
contents: Some(contents.into()),
post_blank: post_blank.map(Into::<&str>::into),
children, children,
}, },
)) ))
@ -115,12 +118,12 @@ pub(crate) fn section<'b, 'g, 'r, 's>(
remaining = remain; remaining = remain;
input = remain; input = remain;
} }
let (remaining, (mut children, _exit_contents)) = verify( let (remaining, (contents, (mut children, _exit_contents))) = consumed(verify(
many_till(element_matcher, exit_matcher), many_till(element_matcher, exit_matcher),
|(children, _exit_contents)| { |(children, _exit_contents)| {
!children.is_empty() || property_drawer_element.is_some() || planning_element.is_some() !children.is_empty() || property_drawer_element.is_some() || planning_element.is_some()
}, },
)(remaining)?; ))(remaining)?;
if let Some(ele) = property_drawer_element.map(Element::PropertyDrawer) { if let Some(ele) = property_drawer_element.map(Element::PropertyDrawer) {
children.insert(0, ele); children.insert(0, ele);
} }
@ -128,7 +131,7 @@ pub(crate) fn section<'b, 'g, 'r, 's>(
children.insert(0, ele) children.insert(0, ele)
} }
let (remaining, _trailing_ws) = let (remaining, post_blank) =
maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?; maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
let source = get_consumed(input, remaining); let source = get_consumed(input, remaining);
@ -136,6 +139,8 @@ pub(crate) fn section<'b, 'g, 'r, 's>(
remaining, remaining,
Section { Section {
source: source.into(), source: source.into(),
contents: Some(contents.into()),
post_blank: post_blank.map(Into::<&str>::into),
children, children,
}, },
)) ))

10
src/types/document.rs
View File

@ -39,6 +39,8 @@ pub struct Heading<'s> {
#[derive(Debug)] #[derive(Debug)]
pub struct Section<'s> { pub struct Section<'s> {
pub source: &'s str, pub source: &'s str,
pub contents: Option<&'s str>,
pub post_blank: Option<&'s str>,
pub children: Vec<Element<'s>>, pub children: Vec<Element<'s>>,
} }
@ -74,11 +76,15 @@ impl<'s> StandardProperties<'s> for Section<'s> {
} }
fn get_contents<'b>(&'b self) -> Option<&'s str> { fn get_contents<'b>(&'b self) -> Option<&'s str> {
todo!() self.contents
} }
fn get_post_blank(&self) -> PostBlank { fn get_post_blank(&self) -> PostBlank {
todo!() self.post_blank
.map(|text| text.lines().count())
.unwrap_or(0)
.try_into()
.expect("Too much post-blank to fit into a PostBlank.")
} }
} }