Skip to content

Properly handle default parameter value when the parameter type is a value type #355

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

Merged
merged 2 commits into from
Apr 4, 2025
Merged

Properly handle default parameter value when the parameter type is a value type #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9789b0f
Handle value default values
metoule Apr 3, 2025
5d36251
Merge branch 'master' into fix_354
metoule Apr 4, 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
7 changes: 6 additions & 1 deletion src/DynamicExpresso.Core/Resolution/MethodResolution.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,12 @@ public static bool CheckIfMethodIsApplicableAndPrepareIt(MethodData method, Expr
if (parameter.HasDefaultValue)
{
var parameterType = TypeUtils.GetConcreteTypeForGenericMethod(parameter.ParameterType, promotedArgs, method);
promotedArgs.Add(Expression.Constant(parameter.DefaultValue, parameterType));

var defaultValue = parameter.DefaultValue;
if (defaultValue is null && parameterType.IsValueType)
defaultValue = Activator.CreateInstance(parameterType);

promotedArgs.Add(Expression.Constant(defaultValue, parameterType));
}
else if (ReflectionExtensions.HasParamsArrayType(parameter))
{
Expand Down
14 changes: 14 additions & 0 deletions test/DynamicExpresso.UnitTest/GithubIssues.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,11 @@ public List<int> Add(List<int> list, Func<int, int> transform)
{
return list.Select(i => transform(i)).ToList();
}

public Guid ReturnsGuid(Guid guid = default)
{
return guid;
}
}

[Test]
Expand Down Expand Up @@ -877,6 +882,15 @@ public void GitHub_Issue_341()

Assert.That(interpreter.Eval<bool>("(int)x == 1"), Is.EqualTo((int)x == 1));
}

[Test]
public void GitHub_Issue_354()
{
var interpreter = new Interpreter();
interpreter.SetVariable("b", new Functions());

Assert.That(interpreter.Eval<Guid>("b.ReturnsGuid()"), Is.EqualTo(Guid.Empty));
}
}

internal static class GithubIssuesTestExtensionsMethods
Expand Down
Loading