Refactoring

Sébastien Geiser · Sébastien Geiser · commit c7fc80ab6191 · 2020-02-03T16:40:19.000+01:00
diff --git a/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs b/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs
@@ -1919,11 +1919,11 @@ protected virtual bool EvaluateVarOrFunc(string expression, Stack<object> stack,
                         }
                         else if (Variables.TryGetValue(varFuncName, out object o) && o is InternalDelegate lambdaExpression)
                         {
-                            stack.Push(lambdaExpression.Invoke(funcArgs.ConvertAll(e => Evaluate(e)).ToArray()));
+                            stack.Push(lambdaExpression.Invoke(funcArgs.ConvertAll(Evaluate).ToArray()));
                         }
                         else if (Variables.TryGetValue(varFuncName, out o) && o is Delegate delegateVar)
                         {
-                            stack.Push(delegateVar.DynamicInvoke(funcArgs.ConvertAll(e => Evaluate(e)).ToArray()));
+                            stack.Push(delegateVar.DynamicInvoke(funcArgs.ConvertAll(Evaluate).ToArray()));
                         }
                         else
                         {

Original file line number	Diff line number	Diff line change
`@@ -1919,11 +1919,11 @@ protected virtual bool EvaluateVarOrFunc(string expression, Stack<object> stack,`
`1919`	`1919`	`}`
`1920`	`1920`	`else if (Variables.TryGetValue(varFuncName, out object o) && o is InternalDelegate lambdaExpression)`
`1921`	`1921`	`{`
`1922`		`- stack.Push(lambdaExpression.Invoke(funcArgs.ConvertAll(e => Evaluate(e)).ToArray()));`
	`1922`	`+ stack.Push(lambdaExpression.Invoke(funcArgs.ConvertAll(Evaluate).ToArray()));`
`1923`	`1923`	`}`
`1924`	`1924`	`else if (Variables.TryGetValue(varFuncName, out o) && o is Delegate delegateVar)`
`1925`	`1925`	`{`
`1926`		`- stack.Push(delegateVar.DynamicInvoke(funcArgs.ConvertAll(e => Evaluate(e)).ToArray()));`
	`1926`	`+ stack.Push(delegateVar.DynamicInvoke(funcArgs.ConvertAll(Evaluate).ToArray()));`
`1927`	`1927`	`}`
`1928`	`1928`	`else`
`1929`	`1929`	`{`