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

Evaluate module cleanup

Browse Source
This commit is contained in:
Mark
2023-06-11 14:24:43 -07:00
parent 5c2dab4b53
commit 368c178ddc
7 changed files with 65 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/evaluate/operator.rs
View File

@ -4,11 +4,15 @@ use crate::quantity::Quantity;
use crate::parser::Operator;
use crate::parser::Token;
use super::EvalError;
use super::function::func_apply;
pub fn op_apply(op: &mut Operator, args: &VecDeque<Token>) -> Result<Token, EvalError> {
pub fn eval_operator(op: &Operator, args: &VecDeque<Token>) -> Result<Token, 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 |
@ -156,10 +160,6 @@ pub fn op_apply(op: &mut Operator, args: &VecDeque<Token>) -> Result<Token, Eval
return Ok(Token::Quantity(prod));
} else { panic!(); }
},
Operator::Function(f) => {
return func_apply(f, args);
}
};
}