Better nullable types management

Sébastien Geiser · Sébastien Geiser · commit 3c246798c47c · 2019-09-27T16:14:30.000+02:00
diff --git a/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs b/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs
@@ -2184,7 +2184,7 @@ protected virtual bool EvaluateVarOrFunc(string expression, Stack<object> stack,
                                 {
                                     if (Variables.ContainsKey(varFuncName) && Variables[varFuncName] is StronglyTypedVariable stronglyTypedVariable)
                                     {
-                                        if(cusVarValueToPush == null && !stronglyTypedVariable.Type.IsValueType)
+                                        if(cusVarValueToPush == null && stronglyTypedVariable.Type.IsValueType && Nullable.GetUnderlyingType(stronglyTypedVariable.Type) == null)
                                         {
                                             throw new ExpressionEvaluatorSyntaxErrorException($"Can not cast null to {stronglyTypedVariable.Type} because it's not a nullable valueType");
                                         }

Original file line number	Diff line number	Diff line change
`@@ -2184,7 +2184,7 @@ protected virtual bool EvaluateVarOrFunc(string expression, Stack<object> stack,`
`2184`	`2184`	`{`
`2185`	`2185`	`if (Variables.ContainsKey(varFuncName) && Variables[varFuncName] is StronglyTypedVariable stronglyTypedVariable)`
`2186`	`2186`	`{`
`2187`		`- if(cusVarValueToPush == null && !stronglyTypedVariable.Type.IsValueType)`
	`2187`	`+ if(cusVarValueToPush == null && stronglyTypedVariable.Type.IsValueType && Nullable.GetUnderlyingType(stronglyTypedVariable.Type) == null)`
`2188`	`2188`	`{`
`2189`	`2189`	`throw new ExpressionEvaluatorSyntaxErrorException($"Can not cast null to {stronglyTypedVariable.Type} because it's not a nullable valueType");`
`2190`	`2190`	`}`