Merge pull request #106 from stg609/master

codingseb · web-flow · commit 05cc3b7d6266 · 2021-06-21T08:05:18.000+02:00
Fix if member == null, and EvaluateVariable set Value = null on purpo…
diff --git a/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs b/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs
@@ -2258,6 +2258,7 @@ where method.GetParameters()[0].ParameterType == objType // static extMethod(thi
                                             pushVarValue = false;
                                     }
 
+									bool isVarValueSet = false;
                                     if (member == null && pushVarValue)
                                     {
                                         VariableEvaluationEventArg variableEvaluationEventArg = new VariableEvaluationEventArg(varFuncName, this, obj ?? keepObj, genericsTypes, GetConcreteTypes);
@@ -2267,10 +2268,11 @@ where method.GetParameters()[0].ParameterType == objType // static extMethod(thi
                                         if (variableEvaluationEventArg.HasValue)
                                         {
                                             varValue = variableEvaluationEventArg.Value;
+											isVarValueSet = true;
                                         }
                                     }
 
-                                    if (!isDynamic && varValue == null && pushVarValue)
+                                    if (!isVarValueSet && !isDynamic && varValue == null && pushVarValue)
                                     {
                                         varValue = ((dynamic)member).GetValue(obj);
 

Original file line number	Diff line number	Diff line change
`@@ -2258,6 +2258,7 @@ where method.GetParameters()[0].ParameterType == objType // static extMethod(thi`
`2258`	`2258`	`pushVarValue = false;`
`2259`	`2259`	`}`
`2260`	`2260`
	`2261`	`+ bool isVarValueSet = false;`
`2261`	`2262`	`if (member == null && pushVarValue)`
`2262`	`2263`	`{`
`2263`	`2264`	`VariableEvaluationEventArg variableEvaluationEventArg = new VariableEvaluationEventArg(varFuncName, this, obj ?? keepObj, genericsTypes, GetConcreteTypes);`
`@@ -2267,10 +2268,11 @@ where method.GetParameters()[0].ParameterType == objType // static extMethod(thi`
`2267`	`2268`	`if (variableEvaluationEventArg.HasValue)`
`2268`	`2269`	`{`
`2269`	`2270`	`varValue = variableEvaluationEventArg.Value;`
	`2271`	`+ isVarValueSet = true;`
`2270`	`2272`	`}`
`2271`	`2273`	`}`
`2272`	`2274`
`2273`		`- if (!isDynamic && varValue == null && pushVarValue)`
	`2275`	`+ if (!isVarValueSet && !isDynamic && varValue == null && pushVarValue)`
`2274`	`2276`	`{`
`2275`	`2277`	`varValue = ((dynamic)member).GetValue(obj);`
`2276`	`2278`