Skip to content

Fix nullable type #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix nullable type #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
069b290
Fix nullable type
khai1198 Mar 6, 2025
722099a
Add Nullable<bool>
khai1198 Mar 6, 2025
0348d75
LessThan. GreaterThan, LessThanOrEqual, GreaterThanOrEqual Nullable
khai1198 Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DynamicExpressions.Benchmarks/Entry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ public class Entry
{

public string Title { get; set; }
public int Number { get; set; }
public int? Number { get; set; }
public SubEntry SubEntry { get; set; }

public Entry(string title, int number)
Expand Down
65 changes: 60 additions & 5 deletions DynamicExpressions/DynamicExpressions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ private static Expression CreateFilter(MemberExpression prop, FilterOperator op,
return op switch
{
FilterOperator.Equals => RobustEquals(prop, constant),
FilterOperator.GreaterThan => Expression.GreaterThan(prop, constant),
FilterOperator.LessThan => Expression.LessThan(prop, constant),
FilterOperator.GreaterThan => RobustGreaterThan(prop, constant),
FilterOperator.LessThan => RobustLessThan(prop, constant),
FilterOperator.ContainsIgnoreCase => Expression.Call(prop, _stringContainsMethodIgnoreCase, PrepareConstant(constant), Expression.Constant(StringComparison.OrdinalIgnoreCase)),
FilterOperator.Contains => GetContainsMethodCallExpression(prop, constant),
FilterOperator.NotContains => Expression.Not(GetContainsMethodCallExpression(prop, constant)),
Expand All @@ -72,23 +72,78 @@ private static Expression CreateFilter(MemberExpression prop, FilterOperator op,
FilterOperator.StartsWith => Expression.Call(prop, _startsWithMethod, PrepareConstant(constant)),
FilterOperator.EndsWith => Expression.Call(prop, _endsWithMethod, PrepareConstant(constant)),
FilterOperator.DoesntEqual => Expression.Not(RobustEquals(prop, constant)),
FilterOperator.GreaterThanOrEqual => Expression.GreaterThanOrEqual(prop, constant),
FilterOperator.LessThanOrEqual => Expression.LessThanOrEqual(prop, constant),
FilterOperator.GreaterThanOrEqual => RobustGreaterThanOrEqual(prop, constant),
FilterOperator.LessThanOrEqual => RobustLessThanOrEqual(prop, constant),
FilterOperator.IsEmpty => Expression.Call(_isNullOrEmtpyMethod, prop),
FilterOperator.IsNotEmpty => Expression.Not(Expression.Call(_isNullOrEmtpyMethod, prop)),
_ => throw new NotImplementedException()
};
}

private static BinaryExpression RobustLessThanOrEqual(MemberExpression prop, ConstantExpression constant)
{
if (IsNullableType(prop.Type))
{
var constantNullable = Expression.Convert(constant, prop.Type);
return Expression.LessThanOrEqual(prop, constantNullable);
}
return Expression.LessThanOrEqual(prop, constant);
}

private static BinaryExpression RobustGreaterThanOrEqual(MemberExpression prop, ConstantExpression constant)
{
if (IsNullableType(prop.Type))
{
var constantNullable = Expression.Convert(constant, prop.Type);
return Expression.GreaterThanOrEqual(prop, constantNullable);
}
return Expression.GreaterThanOrEqual(prop, constant);
}

private static BinaryExpression RobustGreaterThan(MemberExpression prop, ConstantExpression constant)
{
if (IsNullableType(prop.Type))
{
var constantNullable = Expression.Convert(constant, prop.Type);
return Expression.GreaterThan(prop, constantNullable);
}
return Expression.GreaterThan(prop, constant);
}

private static BinaryExpression RobustLessThan(MemberExpression prop, ConstantExpression constant)
{
if (IsNullableType(prop.Type))
{
var constantNullable = Expression.Convert(constant, prop.Type);
return Expression.LessThan(prop, constantNullable);
}
return Expression.LessThan(prop, constant);
}

private static Expression RobustEquals(MemberExpression prop, ConstantExpression constant)
{
if (prop.Type == typeof(bool) && bool.TryParse(constant.Value.ToString(), out var val))
if (prop.Type == typeof(bool?) && bool.TryParse(constant.Value.ToString(), out var val))
{
var constantNullable = Expression.Convert(Expression.Constant(val), prop.Type);
return Expression.Equal(prop, constantNullable);
}
else if (prop.Type == typeof(bool) && bool.TryParse(constant.Value.ToString(), out val))
{
return Expression.Equal(prop, Expression.Constant(val));
}
if (IsNullableType(prop.Type))
{
var constantNullable = Expression.Convert(constant, prop.Type);
return Expression.Equal(prop, constantNullable);
}
return Expression.Equal(prop, constant);
}

private static bool IsNullableType(Type t)
{
return t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Nullable<>);
}

private static Expression GetContainsMethodCallExpression(MemberExpression prop, ConstantExpression constant)
{
if (prop.Type == _stringType)
Expand Down