Skip to content

Commit ed85576

Browse files
committed
Some refactors
1 parent 629f893 commit ed85576

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1995,19 +1995,21 @@ void Evaluator_PreEvaluateVariable(object sender, VariablePreEvaluationEventArg
19951995
.SetCategory("Static Onthefly");
19961996

19971997
// MR #106
1998-
ExpressionEvaluator nullForceevaluator = new ExpressionEvaluator();
1999-
nullForceevaluator.Variables = new Dictionary<string, object>()
1998+
ExpressionEvaluator nullForceEvaluator = new ExpressionEvaluator
1999+
{
2000+
Variables = new Dictionary<string, object>()
20002001
{
20012002
{ "obj", new { }}
2003+
}
20022004
};
20032005

2004-
nullForceevaluator.EvaluateVariable += (sender, e) =>
2006+
nullForceEvaluator.EvaluateVariable += (sender, e) =>
20052007
{
20062008
e.HasValue = true;
20072009
e.Value = null;
20082010
};
20092011

2010-
yield return new TestCaseData(nullForceevaluator
2012+
yield return new TestCaseData(nullForceEvaluator
20112013
, "obj.x"
20122014
, null)
20132015
.Returns(null)

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2796,7 +2796,7 @@ protected virtual bool EvaluateIndexing(string expression, Stack<object> stack,
27962796

27972797
if(type.IsArray && OptionForceIntegerNumbersEvaluationsAsDoubleByDefault)
27982798
{
2799-
oIndexingArgs = oIndexingArgs.Select(o => o is double ? (int)o : o).ToList();
2799+
oIndexingArgs = oIndexingArgs.ConvertAll(o => o is double ? (int)o : o);
28002800
}
28012801
else
28022802
{

0 commit comments

Comments
 (0)