diff --git a/build.rs b/build.rs index 31e474fd..058a8ee7 100644 --- a/build.rs +++ b/build.rs @@ -74,7 +74,7 @@ fn write_header(test_file: &mut File) { use organic::compare_document; use organic::parser::parse; use organic::emacs_parse_anonymous_org_document; -use organic::parser::sexp::sexp_with_padding; +use organic::parser::sexp::sexp; "# ) diff --git a/src/bin_compare.rs b/src/bin_compare.rs index 3c65ebc8..da41af8e 100644 --- a/src/bin_compare.rs +++ b/src/bin_compare.rs @@ -10,7 +10,7 @@ use organic::emacs_parse_file_org_document; use organic::get_emacs_version; use organic::get_org_mode_version; use organic::parser::parse_with_settings; -use organic::parser::sexp::sexp_with_padding; +use organic::parser::sexp::sexp; use organic::GlobalSettings; use organic::LocalFileAccessInterface; @@ -67,7 +67,7 @@ fn run_anonymous_parse>(org_contents: P) -> Result<(), Box>(org_path: P) -> Result<(), Box Result> } #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))] -pub fn sexp_with_padding<'s>(input: &'s str) -> Res<&'s str, Token<'s>> { +pub fn sexp<'s>(input: &'s str) -> Res<&'s str, Token<'s>> { let (remaining, _) = multispace0(input)?; let remaining = OrgSource::new(remaining); let (remaining, tkn) = token(remaining) @@ -146,12 +146,6 @@ pub fn sexp_with_padding<'s>(input: &'s str) -> Res<&'s str, Token<'s>> { Ok((remaining, tkn)) } -#[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))] -fn sexp<'s>(input: OrgSource<'s>) -> Res, Token<'s>> { - let (remaining, tkn) = token(input)?; - Ok((remaining, tkn)) -} - #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))] fn token<'s>(input: OrgSource<'s>) -> Res, Token<'s>> { alt((list, vector, atom))(input) @@ -259,7 +253,7 @@ mod tests { #[test] fn simple() { let input = " (foo bar baz ) "; - let (remaining, parsed) = sexp_with_padding(input).expect("Parse the input"); + let (remaining, parsed) = sexp(input).expect("Parse the input"); assert_eq!(remaining, ""); assert!(match parsed { Token::Atom(_) => false, @@ -272,7 +266,7 @@ mod tests { #[test] fn quoted() { let input = r#" ("foo" bar baz ) "#; - let (remaining, parsed) = sexp_with_padding(input).expect("Parse the input"); + let (remaining, parsed) = sexp(input).expect("Parse the input"); assert_eq!(remaining, ""); assert!(match parsed { Token::Atom(_) => false, @@ -296,7 +290,7 @@ mod tests { #[test] fn quoted_containing_paren() { let input = r#" (foo "b(a)r" baz ) "#; - let (remaining, parsed) = sexp_with_padding(input).expect("Parse the input"); + let (remaining, parsed) = sexp(input).expect("Parse the input"); assert_eq!(remaining, ""); assert!(match parsed { Token::List(_) => true, @@ -332,7 +326,7 @@ mod tests { #[test] fn string_containing_escaped_characters() { let input = r#" (foo "\\( x=2 \\)" bar) "#; - let (remaining, parsed) = sexp_with_padding(input).expect("Parse the input"); + let (remaining, parsed) = sexp(input).expect("Parse the input"); assert_eq!(remaining, ""); assert!(match parsed { Token::Atom(_) => false, diff --git a/tests/test_template b/tests/test_template index 776ebbef..31af35ea 100644 --- a/tests/test_template +++ b/tests/test_template @@ -5,7 +5,7 @@ fn {name}() {{ println!("{{}}", org_contents); let org_sexp = emacs_parse_anonymous_org_document(org_contents.as_str()).expect("Use emacs to parse org file."); println!("{{}}", org_sexp); - let (_remaining, parsed_sexp) = sexp_with_padding(org_sexp.as_str()).expect("Sexp Parse failure"); + let (_remaining, parsed_sexp) = sexp(org_sexp.as_str()).expect("Sexp Parse failure"); let rust_parsed = parse(org_contents.as_str()).expect("Org Parse failure"); println!("{{:#?}}", rust_parsed); let diff_result =