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

Update diary sexp parser to match org-mode's behavior.

Browse Source
This commit is contained in:
Tom Alexander 2023-09-11 12:34:57 -04:00
parent f54081437a
commit f103d168d5
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org_mode_samples/lesser_element/diary_sexp/not_real_sexp.org Normal file
View File

@ -0,0 +1,6 @@
%%(foo
)
%%(bar ; baz
lorem

19
src/parser/diary_sexp.rs
View File

@ -1,16 +1,11 @@
use nom::branch::alt; use nom::branch::alt;
use nom::bytes::complete::is_not;
use nom::bytes::complete::tag; use nom::bytes::complete::tag;
use nom::character::complete::anychar;
use nom::character::complete::line_ending; use nom::character::complete::line_ending;
use nom::character::complete::space0;
use nom::combinator::eof; use nom::combinator::eof;
use nom::combinator::opt;
use nom::combinator::recognize;
use nom::multi::many_till;
use nom::sequence::tuple; use nom::sequence::tuple;
use super::org_source::OrgSource; use super::org_source::OrgSource;
use super::sexp::sexp;
use crate::context::RefContext; use crate::context::RefContext;
use crate::error::Res; use crate::error::Res;
use crate::parser::util::get_consumed; use crate::parser::util::get_consumed;
@ -23,15 +18,9 @@ pub fn diary_sexp<'b, 'g, 'r, 's>(
input: OrgSource<'s>, input: OrgSource<'s>,
) -> Res<OrgSource<'s>, DiarySexp<'s>> { ) -> Res<OrgSource<'s>, DiarySexp<'s>> {
start_of_line(input)?; start_of_line(input)?;
let (remaining, _clock) = tag("%%")(input)?; let (remaining, _clock) = tag("%%(")(input)?;
let (remaining, _sexp) = recognize(sexp)(remaining)?; let (remaining, _contents) = is_not("\r\n")(remaining)?;
let (remaining, _trailing_comment) = opt(tuple(( let (remaining, _eol) = alt((line_ending, eof))(remaining)?;
space0,
tag(";"),
many_till(anychar, alt((line_ending, eof))),
)))(remaining)?;
let (remaining, _trailing_whitespace) =
recognize(tuple((space0, alt((line_ending, eof)))))(remaining)?;
let source = get_consumed(input, remaining); let source = get_consumed(input, remaining);
Ok(( Ok((