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 basic units (incomplete)

Browse Source
This commit is contained in:
Mark
2023-04-08 16:47:47 -07:00
parent 10f706582e
commit 5b8dd2f703
8 changed files with 396 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/parser/mod.rs
View File

@ -12,7 +12,7 @@ use crate::parser::groupify::groupify;
use crate::parser::treeify::treeify;
use crate::parser::find_subs::find_subs;
use crate::quantity::Quantity;
use crate::quantity::{Quantity, BaseUnit};
use crate::tokens::Token;
@ -96,6 +96,19 @@ impl PreToken {
"e" => { Token::Constant(Quantity::new_float_from_string("2.718281828459045235360287471352662497757247093699959574966967627724076630353547594571382178525166427").unwrap(), String::from("e")) },
"phi"|"φ" => { Token::Constant(Quantity::new_float_from_string("1.618033988749894848204586834365638117720309179805762862135448622705260462818902449707207204189391137").unwrap(), String::from("φ")) },
// Units
"m" => {
let mut u = Quantity::new_rational(1, 1);
u.add_unit(BaseUnit::Meter, 1f64);
Token::Number(u)
},
"s" => {
let mut u = Quantity::new_rational(1, 1);
u.add_unit(BaseUnit::Second, 1f64);
Token::Number(u)
}
_ => { return Err((l, ParserError::Undefined(s))); }
});
}