jeff/expressive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make Operator::max_argument_amount optional

Browse Source 
Relates to #44
This commit is contained in:
Sebastian Schmidt 2019-04-13 19:11:09 +02:00
parent 1c68866777
commit 1721e163b0
2 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/operator/mod.rs
View File

@ -23,12 +23,12 @@ pub trait Operator: Debug + Display {
/// True if this operator is a leaf, meaning it accepts no arguments. /// True if this operator is a leaf, meaning it accepts no arguments.
// Make this a const fn once #57563 is resolved // Make this a const fn once #57563 is resolved
fn is_leaf(&self) -> bool { fn is_leaf(&self) -> bool {
self.max_argument_amount() == 0 self.max_argument_amount() == Some(0)
} }
/// Returns the maximum amount of arguments required by this operator. /// Returns the maximum amount of arguments required by this operator.
// Make this a const fn once #57563 is resolved // Make this a const fn once #57563 is resolved
fn max_argument_amount(&self) -> usize; fn max_argument_amount(&self) -> Option<usize>;
/// Evaluates the operator with the given arguments and context. /// Evaluates the operator with the given arguments and context.
fn eval(&self, arguments: &[Value], context: &dyn Context) -> EvalexprResult<Value>; fn eval(&self, arguments: &[Value], context: &dyn Context) -> EvalexprResult<Value>;
@ -127,8 +127,8 @@ impl Operator for RootNode {
200 200
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
1 Some(1)
} }
fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> { fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> {
@ -145,8 +145,8 @@ impl Operator for Add {
95 95
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
2 Some(2)
} }
fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> { fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> {
@ -182,8 +182,8 @@ impl Operator for Sub {
95 95
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
2 Some(2)
} }
fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> { fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> {
@ -214,8 +214,8 @@ impl Operator for Neg {
110 110
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
1 Some(1)
} }
fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> { fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> {
@ -240,8 +240,8 @@ impl Operator for Mul {
100 100
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
2 Some(2)
} }
fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> { fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> {
@ -272,8 +272,8 @@ impl Operator for Div {
100 100
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
2 Some(2)
} }
fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> { fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> {
@ -304,8 +304,8 @@ impl Operator for Mod {
100 100
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
2 Some(2)
} }
fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> { fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> {
@ -336,8 +336,8 @@ impl Operator for Exp {
120 120
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
2 Some(2)
} }
fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> { fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> {
@ -359,8 +359,8 @@ impl Operator for Eq {
80 80
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
2 Some(2)
} }
fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> { fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> {
@ -379,8 +379,8 @@ impl Operator for Neq {
80 80
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
2 Some(2)
} }
fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> { fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> {
@ -399,8 +399,8 @@ impl Operator for Gt {
80 80
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
2 Some(2)
} }
fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> { fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> {
@ -435,8 +435,8 @@ impl Operator for Lt {
80 80
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
2 Some(2)
} }
fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> { fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> {
@ -471,8 +471,8 @@ impl Operator for Geq {
80 80
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
2 Some(2)
} }
fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> { fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> {
@ -507,8 +507,8 @@ impl Operator for Leq {
80 80
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
2 Some(2)
} }
fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> { fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> {
@ -543,8 +543,8 @@ impl Operator for And {
75 75
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
2 Some(2)
} }
fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> { fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> {
@ -565,8 +565,8 @@ impl Operator for Or {
70 70
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
2 Some(2)
} }
fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> { fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> {
@ -587,8 +587,8 @@ impl Operator for Not {
110 110
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
1 Some(1)
} }
fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> { fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> {
@ -608,8 +608,8 @@ impl Operator for Tuple {
40 40
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
2 Some(2)
} }
fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> { fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> {
@ -646,8 +646,8 @@ impl Operator for Assign {
false false
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
2 Some(2)
} }
fn eval(&self, _arguments: &[Value], _context: &Context) -> EvalexprResult<Value> { fn eval(&self, _arguments: &[Value], _context: &Context) -> EvalexprResult<Value> {
@ -668,8 +668,8 @@ impl Operator for Chain {
0 0
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
2 Some(2)
} }
fn eval(&self, arguments: &[Value], _context: &Context) -> Result<Value, EvalexprError> { fn eval(&self, arguments: &[Value], _context: &Context) -> Result<Value, EvalexprError> {
@ -686,8 +686,8 @@ impl Operator for Const {
200 200
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
0 Some(0)
} }
fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> { fn eval(&self, arguments: &[Value], _context: &Context) -> EvalexprResult<Value> {
@ -702,8 +702,8 @@ impl Operator for VariableIdentifier {
200 200
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
0 Some(0)
} }
fn eval(&self, _arguments: &[Value], context: &Context) -> EvalexprResult<Value> { fn eval(&self, _arguments: &[Value], context: &Context) -> EvalexprResult<Value> {
@ -730,8 +730,8 @@ impl Operator for FunctionIdentifier {
false false
} }
fn max_argument_amount(&self) -> usize { fn max_argument_amount(&self) -> Option<usize> {
1 Some(1)
} }
fn eval(&self, arguments: &[Value], context: &Context) -> EvalexprResult<Value> { fn eval(&self, arguments: &[Value], context: &Context) -> EvalexprResult<Value> {

2
src/tree/mod.rs
View File

@ -316,7 +316,7 @@ impl Node {
} }
fn has_enough_children(&self) -> bool { fn has_enough_children(&self) -> bool {
self.children().len() == self.operator().max_argument_amount() Some(self.children().len()) == self.operator().max_argument_amount()
} }
fn insert_back_prioritized(&mut self, node: Node, is_root_node: bool) -> EvalexprResult<()> { fn insert_back_prioritized(&mut self, node: Node, is_root_node: bool) -> EvalexprResult<()> {