More tests for var and func evaluations priorities

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -1402,15 +1402,29 @@ public static IEnumerable<TestCaseData> TestCasesForExceptionThrowingEvaluation
 
                 #region On the fly pre events cancel
 
-                evaluator = new ExpressionEvaluator();
+                evaluator = new ExpressionEvaluator(new Dictionary<string, object>
+                {
+                    { "P1var", "P1" },
+                    { "myObj", new ClassForTest1() },
+                });
 
                 evaluator.PreEvaluateVariable += (sender, e) =>
                 {
                     if (e.Name.StartsWith("P"))
                         e.CancelEvaluation = true;
                 };
 
+                evaluator.PreEvaluateFunction += (sender, e) =>
+                {
+                    if (e.Name.StartsWith("A"))
+                        e.CancelEvaluation = true;
+                };
+
                 yield return new TestCaseData(evaluator, "Pi", typeof(ExpressionEvaluatorSyntaxErrorException)).SetCategory("OnTheFly canceled Var");
+                yield return new TestCaseData(evaluator, "P1var", typeof(ExpressionEvaluatorSyntaxErrorException)).SetCategory("OnTheFly canceled Var");
+                yield return new TestCaseData(evaluator, "myObj.PropertyThatWillFailed", typeof(ExpressionEvaluatorSyntaxErrorException)).SetCategory("OnTheFly canceled Var");
+                yield return new TestCaseData(evaluator, "myObj.Add3To(5)", typeof(ExpressionEvaluatorSyntaxErrorException)).SetCategory("OnTheFly canceled Func");
+                yield return new TestCaseData(evaluator, "Abs(-5)", typeof(ExpressionEvaluatorSyntaxErrorException)).SetCategory("OnTheFly canceled Func");
 
                 #endregion
             }
@@ -1563,14 +1577,20 @@ public static IEnumerable<TestCaseData> TestCasesEvaluateWithSpecificEvaluator
 
                 #endregion
 
-                #region Onthefly events (Pre events and/or Generics)
+                #region Onthefly events (Pre events custom vars and standard events priorities and/or Generics)
 
-                ExpressionEvaluator evaluatorOnTheFlyGenericTypes = new ExpressionEvaluator();
+                ExpressionEvaluator evaluatorOnTheFlyGenericTypes = new ExpressionEvaluator(new Dictionary<string, object>
+                {
+                    { "myvar1", 10 },
+                    { "myvar2", 3 },
+                });
 
                 void VariableEval(object sender, VariableEvaluationEventArg e)
                 {
-                    if(e.Name.Equals("GetSpecifiedGenericTypesVar"))
+                    if (e.Name.Equals("GetSpecifiedGenericTypesVar"))
                         e.Value = e.EvaluateGenericTypes();
+                    else if (e.Name.Equals("myvar2"))
+                        e.Value = 50;
                 }
 
                 void FunctionEval(object sender, FunctionEvaluationEventArg e)
@@ -1647,6 +1667,16 @@ void Evaluator_PreEvaluateVariable(object sender, VariablePreEvaluationEventArg
                         .SetCategory("On the fly var")
                         .SetCategory("GenericTypes");
 
+                yield return new TestCaseData(evaluatorOnTheFlyGenericTypes
+                        , "myvar1")
+                        .Returns(5)
+                        .SetCategory("var evaluation priority");
+
+                yield return new TestCaseData(evaluatorOnTheFlyGenericTypes
+                        , "myvar2")
+                        .Returns(3)
+                        .SetCategory("var evaluation priority");
+
                 #endregion
             }
         }

CodingSeb.ExpressionEvaluator.Tests/TestsUtils/ClassForTest1.cs

@@ -12,6 +12,8 @@ public class ClassForTest1
 
         public static int StaticIntProperty { get; set; } = 67;
 
+        public int PropertyThatWillFailed { get; set; } = 1;
+
         public int Add3To(int value)
         {
             return value + 3;

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -2120,7 +2120,6 @@ private bool EvaluateVarOrFunc(string expr, string restOfExpression, Stack<objec
                             stack.Push(varValueToPush);
                         }
                         else if ((Variables.TryGetValue(varFuncName, out object cusVarValueToPush) || varFuncMatch.Groups["assignationOperator"].Success)
-                            && !varFuncMatch.Groups["inObject"].Success
                             && (cusVarValueToPush == null || !TypesToBlock.Contains(cusVarValueToPush.GetType())))
                         {
                             stack.Push(cusVarValueToPush);