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

Added formattedtext and better error class

Browse Source
This commit is contained in:
Mark
2023-08-03 22:13:38 -07:00
parent 8076990a41
commit e67a5c4696
14 changed files with 522 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/parser/mod.rs
View File

@ -1,14 +1,10 @@
mod stage;
mod token;
mod parsererror;
mod expression;
mod linelocation;
use self::{
token::Token,
parsererror::ParserError,
};
use self::token::Token;
pub use self::{
expression::Expression,
@ -19,11 +15,11 @@ pub use self::{
};
use crate::context::Context;
use crate::errors::DaisyError;
pub fn parse(
s: &String, context: &Context
) -> Result<Expression, (LineLocation, ParserError)> {
) -> Result<Expression, (LineLocation, DaisyError)> {
let expressions = stage::tokenize(s);
let (_, expressions) = stage::find_subs(expressions);
@ -33,7 +29,7 @@ pub fn parse(
return Ok(g);
}
pub fn parse_no_context(s: &String) -> Result<Expression, (LineLocation, ParserError)> {
pub fn parse_no_context(s: &String) -> Result<Expression, (LineLocation, DaisyError)> {
parse(s, &Context::new())
}