From 18f8e2562e7b377bbdb064b600562eb70475ccb4 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Wed, 19 Apr 2023 16:54:17 -0400 Subject: [PATCH] Remove the old toy language binary. Using the org_mode_samples integration tests through the rust test framework has removed the need for the toy language binary and I think removing it will make rust-analyzer less confused about imports. This repository is now solely a library repository. --- Cargo.toml | 5 ---- src/main.rs | 17 ------------ src/parser/property_drawer.rs | 52 +++++++++++++++++++++++++++++++++++ toy_language.txt | 5 ---- 4 files changed, 52 insertions(+), 27 deletions(-) delete mode 100644 src/main.rs delete mode 100644 toy_language.txt diff --git a/Cargo.toml b/Cargo.toml index 7f42a243..4dd767a3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,16 +3,11 @@ name = "toy" version = "0.1.0" edition = "2021" license = "0BSD" -default-run = "toy" [lib] name = "organic" path = "src/lib.rs" -[[bin]] -name = "toy" -path = "src/main.rs" - [dependencies] nom = "7.1.1" opentelemetry = "0.17.0" diff --git a/src/main.rs b/src/main.rs deleted file mode 100644 index 6201ac92..00000000 --- a/src/main.rs +++ /dev/null @@ -1,17 +0,0 @@ -#![feature(round_char_boundary)] -use crate::init_tracing::init_telemetry; -use crate::init_tracing::shutdown_telemetry; -use crate::parser::document; -mod init_tracing; -mod parser; - -const TEST_DOC: &'static str = include_str!("../toy_language.txt"); - -fn main() -> Result<(), Box> { - init_telemetry()?; - let parsed = document(TEST_DOC); - println!("{}\n\n\n", TEST_DOC); - println!("{:#?}", parsed); - shutdown_telemetry()?; - Ok(()) -} diff --git a/src/parser/property_drawer.rs b/src/parser/property_drawer.rs index 31f2ee53..0b5132fc 100644 --- a/src/parser/property_drawer.rs +++ b/src/parser/property_drawer.rs @@ -1,11 +1,63 @@ use super::Context; +use crate::parser::error::CustomError; +use crate::parser::error::MyError; use crate::parser::error::Res; use crate::parser::greater_element::PropertyDrawer; +use crate::parser::util::immediate_in_section; #[tracing::instrument(ret, level = "debug")] pub fn property_drawer<'r, 's>( context: Context<'r, 's>, input: &'s str, ) -> Res<&'s str, PropertyDrawer<'s>> { + if immediate_in_section(context, "property-drawer") { + return Err(nom::Err::Error(CustomError::MyError(MyError( + "Cannot nest objects of the same element", + )))); + } + // start_of_line(context, input)?; + // let (remaining, _leading_whitespace) = space0(input)?; + // let (remaining, (_open_colon, drawer_name, _close_colon, _new_line)) = tuple(( + // tag(":"), + // name, + // tag(":"), + // recognize(tuple((space0, line_ending))), + // ))(remaining)?; + + // let parser_context = context + // .with_additional_node(ContextElement::ConsumeTrailingWhitespace(true)) + // .with_additional_node(ContextElement::Context("drawer")) + // .with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode { + // class: ExitClass::Alpha, + // exit_matcher: &drawer_end, + // })); + + // let element_matcher = parser_with_context!(element)(&parser_context); + // let exit_matcher = parser_with_context!(exit_matcher_parser)(&parser_context); + // let (remaining, children) = match consumed(many_till(blank_line, exit_matcher))(remaining) { + // Ok((remaining, (whitespace, (_children, _exit_contents)))) => ( + // remaining, + // vec![Element::Paragraph(Paragraph::of_text(whitespace))], + // ), + // Err(_) => { + // let (remaining, (children, _exit_contents)) = + // many_till(element_matcher, exit_matcher)(remaining)?; + // (remaining, children) + // } + // }; + // let (remaining, _end) = drawer_end(&parser_context, remaining)?; + + // let (remaining, _trailing_ws) = + // maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?; + // let source = get_consumed(input, remaining); + + // Ok(( + // remaining, + // Drawer { + // source, + // name: drawer_name, + // children, + // }, + // )) todo!() } diff --git a/toy_language.txt b/toy_language.txt deleted file mode 100644 index 574a2f2e..00000000 --- a/toy_language.txt +++ /dev/null @@ -1,5 +0,0 @@ -foo -:drawername: - - -:end: