Mark/daisy
1
1
Fork 0
mirror of https://github.com/rm-dr/daisy synced 2025-07-05 01:59:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Reorganized variable code

Browse Source
This commit is contained in:
Mark
2023-06-14 16:15:51 -07:00
parent 5ffad0cc4e
commit 00a421756d
10 changed files with 39 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/parser/mod.rs
View File

@ -17,22 +17,26 @@ pub use self::{
token::Function,
};
use crate::context::Context;
pub fn parse(
s: &String
) -> Result<
Token,
(LineLocation, ParserError)
> {
s: &String, context: &Context
) -> Result<Token, (LineLocation, ParserError)> {
let tokens = stage::tokenize(s);
let (_, tokens) = stage::find_subs(tokens);
let g = stage::groupify(tokens)?;
let g = stage::treeify(g)?;
let g = stage::treeify(g, context)?;
return Ok(g);
}
pub fn parse_no_context(s: &String) -> Result<Token, (LineLocation, ParserError)> {
parse(s, &Context::new())
}
pub fn substitute(
s: &String, // The string to substitute