Static on the flies OK

Author: Sébastien Geiser

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -1620,7 +1620,7 @@ void Evaluator_PreEvaluateFunction(object sender, FunctionPreEvaluationEventArg
                         // e.EvaluateGenericTypes() return a Type[]
                         e.Value = e.EvaluateGenericTypes()[0].Namespace;
                     }
-                    else if (e.This is ClassOrTypeName classOrTypeName && classOrTypeName.Type == typeof(ClassForTest1) && e.Name.Equals("OnTheFlyStaticPreVar"))
+                    else if (e.This is ClassOrTypeName classOrTypeName && classOrTypeName.Type == typeof(ClassForTest1) && e.Name.Equals("OnTheFlyStaticPreFunc"))
                     {
                         e.Value = 15;
                     }
@@ -1637,7 +1637,7 @@ void Evaluator_PreEvaluateVariable(object sender, VariablePreEvaluationEventArg
                         // e.EvaluateGenericTypes() return a Type[]
                         e.Value = e.EvaluateGenericTypes()[0].Assembly.GetName().Name;
                     }
-                    else if (e.This is ClassOrTypeName classOrTypeName && classOrTypeName.Type == typeof(ClassForTest1) && e.Name.Equals("OnTheFlyStaticPreFunc"))
+                    else if (e.This is ClassOrTypeName classOrTypeName && classOrTypeName.Type == typeof(ClassForTest1) && e.Name.Equals("OnTheFlyStaticPreVar"))
                     {
                         e.Value = 3;
                     }
@@ -1673,18 +1673,6 @@ void Evaluator_PreEvaluateVariable(object sender, VariablePreEvaluationEventArg
                         .SetCategory("On the fly var")
                         .SetCategory("GenericTypes");
 
-                yield return new TestCaseData(evaluatorOnTheFlies
-                        , "ClassForTest1.OnTheFlyStaticFunc()")
-                        .Returns(5)
-                        .SetCategory("On the fly func")
-                        .SetCategory("Static Onthefly");
-
-                yield return new TestCaseData(evaluatorOnTheFlies
-                        , "ClassForTest1.OnTheFlyStaticVar")
-                        .Returns(5)
-                        .SetCategory("On the fly var")
-                        .SetCategory("Static Onthefly");
-
                 yield return new TestCaseData(evaluatorOnTheFlies
                         , "myvar1")
                         .Returns(5)
@@ -1695,15 +1683,27 @@ void Evaluator_PreEvaluateVariable(object sender, VariablePreEvaluationEventArg
                         .Returns(3)
                         .SetCategory("var evaluation priority");
 
+                yield return new TestCaseData(evaluatorOnTheFlies
+                        , "ClassForTest1.OnTheFlyStaticFunc()")
+                        .Returns(8)
+                        .SetCategory("On the fly func")
+                        .SetCategory("Static Onthefly");
+
+                yield return new TestCaseData(evaluatorOnTheFlies
+                        , "ClassForTest1.OnTheFlyStaticVar")
+                        .Returns(10)
+                        .SetCategory("On the fly var")
+                        .SetCategory("Static Onthefly");
+
                 yield return new TestCaseData(evaluatorOnTheFlies
                         , "ClassForTest1.OnTheFlyStaticPreFunc()")
-                        .Returns(5)
+                        .Returns(15)
                         .SetCategory("On the fly func")
                         .SetCategory("Static Onthefly");
 
                 yield return new TestCaseData(evaluatorOnTheFlies
                         , "ClassForTest1.OnTheFlyStaticPreVar")
-                        .Returns(5)
+                        .Returns(3)
                         .SetCategory("On the fly var")
                         .SetCategory("Static Onthefly");
 

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -1762,6 +1762,7 @@ private bool EvaluateVarOrFunc(string expr, string restOfExpression, Stack<objec
                         else
                         {
                             object obj = stack.Pop();
+                            object keepObj = obj;
                             Type objType = null;
                             ValueTypeNestingTrace valueTypeNestingTrace = null;
 
@@ -1848,7 +1849,7 @@ private bool EvaluateVarOrFunc(string expr, string restOfExpression, Stack<objec
                                             }
                                             else
                                             {
-                                                FunctionEvaluationEventArg functionEvaluationEventArg = new FunctionEvaluationEventArg(varFuncName, Evaluate, funcArgs, this, obj, genericsTypes, GetConcreteTypes);
+                                                FunctionEvaluationEventArg functionEvaluationEventArg = new FunctionEvaluationEventArg(varFuncName, Evaluate, funcArgs, this, obj ?? keepObj, genericsTypes, GetConcreteTypes);
 
                                                 EvaluateFunction?.Invoke(this, functionEvaluationEventArg);
 
@@ -1928,6 +1929,7 @@ private bool EvaluateVarOrFunc(string expr, string restOfExpression, Stack<objec
                             throw new ExpressionEvaluatorSyntaxErrorException($"[{varFuncMatch.Value}] must follow an object.");
 
                         object obj = stack.Pop();
+                        object keepObj = obj;
                         Type objType = null;
                         ValueTypeNestingTrace valueTypeNestingTrace = null;
 
@@ -1989,7 +1991,7 @@ private bool EvaluateVarOrFunc(string expr, string restOfExpression, Stack<objec
 
                                     if (member == null && pushVarValue)
                                     {
-                                        VariableEvaluationEventArg variableEvaluationEventArg = new VariableEvaluationEventArg(varFuncName, this, obj, genericsTypes, GetConcreteTypes);
+                                        VariableEvaluationEventArg variableEvaluationEventArg = new VariableEvaluationEventArg(varFuncName, this, obj ?? keepObj, genericsTypes, GetConcreteTypes);
 
                                         EvaluateVariable?.Invoke(this, variableEvaluationEventArg);