Added support for invoking two expressions with different parameter c…

…ount at the same time.

SimpleExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -174,5 +174,22 @@ public void Can_ParseNumbers_InDifferentCulture()
 
  Assert.That(engine.Evaluate("5 000,67"), Is.EqualTo(5000.67));
  }
+
+ [Test]
+ public void Can_Invoke_Two_Distinct_Expressions_With_Different_Parameters_Count()
+ {
+ var a = 6m;
+ var b = 3.9m;
+ var c = 4.9m;
+
+ var compiled = engine.Compile("(a+b)/(a+c)");
+ var compiled2 = engine.Compile("(a+b)/a");
+ Assert.That(compiled(new { a, b, c }), Is.EqualTo((a + b) / (a + c)));
+
+ a = 5.4m;
+ b = -2.4m;
+
+ Assert.That(compiled2(new { a, b }), Is.EqualTo((a + b) / a));
+ }
  }
 }

SimpleExpressionEvaluator/ExpressionEvaluator.cs

@@ -20,12 +20,14 @@ public class ExpressionEvaluator : DynamicObject
  {
  var compiled = Parse(expression);
 
- Func<object, decimal> result = argument =>
+ Func<List<string>, Func<object, decimal>> curriedResult = list => argument =>
  {
  var arguments = ParseArguments(argument);
- return Execute(compiled, arguments);
+ return Execute(compiled, arguments, list);
  };
 
+ var result = curriedResult(parameters.ToList());
+
  return result;
  }
 
@@ -184,10 +186,10 @@ private decimal Evaluate(string expression, Dictionary<string, decimal> argument
  {
  var compiled = Parse(expression);
 
- return Execute(compiled, arguments);
+ return Execute(compiled, arguments, parameters);
  }
 
- private decimal Execute(Func<decimal[], decimal> compiled, Dictionary<string, decimal> arguments)
+ private decimal Execute(Func<decimal[], decimal> compiled, Dictionary<string, decimal> arguments, List<string> parameters)
  {
  arguments = arguments ?? new Dictionary<string, decimal>();