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

Rename parser_context to context.

Browse Source
This commit is contained in:
Tom Alexander 2023-09-04 13:26:11 -04:00
parent da1ce2717d
commit 08eb59acd3
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/context/parser_context.rs → src/context/context.rs
View File

11
src/context/global_settings.rs
View File

@ -1,20 +1,21 @@
use super::FileAccessInterface; // use super::FileAccessInterface;
use super::LocalFileAccessInterface; // use super::LocalFileAccessInterface;
use crate::types::Object; use crate::types::Object;
// TODO: Ultimately, I think we'll need most of this: https://orgmode.org/manual/In_002dbuffer-Settings.html // TODO: Ultimately, I think we'll need most of this: https://orgmode.org/manual/In_002dbuffer-Settings.html
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct GlobalSettings<'g, 's, F: FileAccessInterface> { // , F: FileAccessInterface
pub struct GlobalSettings<'g, 's> {
pub radio_targets: Vec<&'g Vec<Object<'s>>>, pub radio_targets: Vec<&'g Vec<Object<'s>>>,
pub file_access: F, // pub file_access: F,
} }
impl<'g, 's> GlobalSettings<'g, 's> { impl<'g, 's> GlobalSettings<'g, 's> {
pub fn new() -> Self { pub fn new() -> Self {
GlobalSettings { GlobalSettings {
radio_targets: Vec::new(), radio_targets: Vec::new(),
file_access: LocalFileAccessInterface, // file_access: LocalFileAccessInterface,
} }
} }
} }

8
src/context/mod.rs
View File

@ -1,11 +1,11 @@
use crate::error::Res; use crate::error::Res;
use crate::parser::OrgSource; use crate::parser::OrgSource;
mod context;
mod exiting; mod exiting;
mod file_access_interface; mod file_access_interface;
mod global_settings; mod global_settings;
mod list; mod list;
mod parser_context;
mod parser_with_context; mod parser_with_context;
pub type RefContext<'b, 'g, 'r, 's> = &'b Context<'g, 'r, 's>; pub type RefContext<'b, 'g, 'r, 's> = &'b Context<'g, 'r, 's>;
@ -18,12 +18,12 @@ pub trait Matcher = for<'s> Fn(OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s
#[allow(dead_code)] #[allow(dead_code)]
pub type DynMatcher<'c> = dyn Matcher + 'c; pub type DynMatcher<'c> = dyn Matcher + 'c;
pub use context::Context;
pub use context::ContextElement;
pub use context::ExitMatcherNode;
pub use exiting::ExitClass; pub use exiting::ExitClass;
pub use file_access_interface::FileAccessInterface; pub use file_access_interface::FileAccessInterface;
pub use file_access_interface::LocalFileAccessInterface; pub use file_access_interface::LocalFileAccessInterface;
pub use global_settings::GlobalSettings; pub use global_settings::GlobalSettings;
pub use list::List; pub use list::List;
pub use parser_context::Context;
pub use parser_context::ContextElement;
pub use parser_context::ExitMatcherNode;
pub(crate) use parser_with_context::parser_with_context; pub(crate) use parser_with_context::parser_with_context;