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

Minor cleanup

Browse Source
This commit is contained in:
Mark
2023-03-29 10:39:15 -07:00
parent 52d848cc09
commit 3d5dcf0694
5 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/parser/mod.rs
View File

@ -80,9 +80,9 @@ impl PreToken {
PreToken::PreWord(l, s) => {
return Ok(match &s[..] {
// Mathematical constants
"π"|"pi" => { Token::Constant(3.141592653, String::from("pi")) },
"π"|"pi" => { Token::Constant(3.141592653, String::from("π")) },
"e" => { Token::Constant(2.71828, String::from("e")) },
"phi"|"φ" => { Token::Constant(1.61803, String::from("phi")) },
"phi"|"φ" => { Token::Constant(1.61803, String::from("φ")) },
_ => { return Err((l, ParserError::Undefined(s))); }
});
}
@ -148,9 +148,9 @@ pub fn parse(
let tokens = tokenize(s);
let (_, tokens) = find_subs(tokens);
let g = groupify(tokens)?;
let t = treeify(g)?;
let g = treeify(g)?;
return Ok(t);
return Ok(g);
}