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

Cleanup

Browse Source
This commit is contained in:
Mark
2023-06-17 19:08:05 -07:00
parent 1495dcd561
commit 73049eeec4
7 changed files with 197 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/evaluate/operator.rs
View File

@ -8,17 +8,7 @@ use crate::context::Context;
pub fn eval_operator(op: &Operator, args: &VecDeque<Expression>, context: &mut Context) -> Result<Option<Expression>, EvalError> {
match op {
// Handled seperately in evaluate.rs
Operator::Function(_) |
// These are never evaluated,
// but are converted to one of the following instead.
Operator::ImplicitMultiply |
Operator::Sqrt |
Operator::Divide |
Operator::DivideLong |
Operator::Subtract => { panic!() }
Operator::Function(_) => unreachable!("Functions are handled seperately."),
Operator::Define => {
if args.len() != 2 { panic!() };
@ -39,18 +29,6 @@ pub fn eval_operator(op: &Operator, args: &VecDeque<Expression>, context: &mut C
} else { return Ok(None); }
},
Operator::Flip => {
if args.len() != 1 { panic!() };
let args = &args[0];
if let Expression::Quantity(v) = args {
if v.is_zero() { return Err(EvalError::ZeroDivision); }
return Ok(Some(Expression::Quantity(
Quantity::new_rational(1f64).unwrap()/v.clone()
)));
} else { return Ok(None); }
},
Operator::Add => {
let mut sum: Quantity;
if let Expression::Quantity(s) = &args[0] {
@ -73,6 +51,38 @@ pub fn eval_operator(op: &Operator, args: &VecDeque<Expression>, context: &mut C
return Ok(Some(Expression::Quantity(sum)));
},
Operator::Subtract => {
if args.len() != 2 { panic!() };
let a = &args[0];
let b = &args[1];
if let Expression::Quantity(a) = a {
if let Expression::Quantity(b) = b {
return Ok(Some(Expression::Quantity(a.clone() - b.clone())));
}
}
return Ok(None);
},
Operator::Divide |
Operator::DivideLong => {
if args.len() != 2 { panic!() };
let a = &args[0];
let b = &args[1];
if let Expression::Quantity(a) = a {
if let Expression::Quantity(b) = b {
if b.is_zero() { return Err(EvalError::ZeroDivision); }
return Ok(Some(Expression::Quantity(a.clone() / b.clone())));
}
}
return Ok(None);
},
Operator::ImplicitMultiply |
Operator::Multiply => {
let mut prod = Quantity::new_rational(1f64).unwrap();
for i in args.iter() {
@ -106,8 +116,7 @@ pub fn eval_operator(op: &Operator, args: &VecDeque<Expression>, context: &mut C
} else { return Ok(None); }
},
Operator::UnitConvert
=> {
Operator::UnitConvert => {
if args.len() != 2 { panic!() };
let a = &args[0];
let b = &args[1];
@ -123,6 +132,19 @@ pub fn eval_operator(op: &Operator, args: &VecDeque<Expression>, context: &mut C
} else { return Ok(None); }
},
Operator::Sqrt => {
if args.len() != 1 { panic!() }
let a = &args[0];
if let Expression::Quantity(va) = a {
if va.is_negative() { return Err(EvalError::BadMath); }
let p = va.pow(Quantity::new_rational_from_string("0.5").unwrap());
if p.is_nan() {return Err(EvalError::BadMath);}
return Ok(Some(Expression::Quantity(p)));
} else { return Ok(None); }
},
Operator::Power => {
if args.len() != 2 {panic!()};
let a = &args[0];