Skip to content

Commit 89aa54e

Browse files
committed
Update TryParse method signatures in converters to include originalValue parameter
1 parent 4e2246f commit 89aa54e

25 files changed

+26
-26
lines changed

Assets/Kekser/UnityCVar/CVarField.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public CVarResult Execute(object target, string[] args)
2929
if (MemberInfo.IsInitOnly)
3030
return new CVarResult(false, $"Field '{Name}' is read-only.");
3131

32-
if (!TypeConverter.TryConvertValue(args[0], MemberInfo.FieldType, out object value))
32+
if (!TypeConverter.TryConvertValue(args[0], MemberInfo.GetValue(target), MemberInfo.FieldType, out object value))
3333
return new CVarResult(false, $"Failed to convert '{args[0]}' to {MemberInfo.FieldType.Name}.");
3434

3535
MemberInfo.SetValue(target, value);

Assets/Kekser/UnityCVar/CVarMethod.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public CVarResult Execute(object target, string[] args)
3434
{
3535
if (i >= args.Length)
3636
arguments[i] = parameters[i].DefaultValue;
37-
else if (!TypeConverter.TryConvertValue(args[i], parameters[i].ParameterType, out arguments[i]))
37+
else if (!TypeConverter.TryConvertValue(args[i], null, parameters[i].ParameterType, out arguments[i]))
3838
return new CVarResult(false, $"Failed to convert '{args[i]}' to {parameters[i].ParameterType.Name}.");
3939
}
4040

Assets/Kekser/UnityCVar/CVarProperty.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public CVarResult Execute(object target, string[] args)
3030
if (!MemberInfo.CanWrite)
3131
return new CVarResult(false, $"Property '{Name}' is read-only.");
3232

33-
if (!TypeConverter.TryConvertValue(args[0], MemberInfo.PropertyType, out object value))
33+
if (!TypeConverter.TryConvertValue(args[0], MemberInfo.CanRead ? MemberInfo.GetValue(target) : null, MemberInfo.PropertyType, out object value))
3434
return new CVarResult(false, $"Failed to convert '{args[0]}' to {MemberInfo.PropertyType.Name}.");
3535

3636
MemberInfo.SetValue(target, value);

Assets/Kekser/UnityCVar/Converter/BoolConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[TypeConverter(typeof(bool))]
44
public class BoolConverter : ITypeConverter
55
{
6-
public bool TryParse(string value, out object result)
6+
public bool TryParse(string value, object originalValue, out object result)
77
{
88
if (bool.TryParse(value, out var b))
99
{

Assets/Kekser/UnityCVar/Converter/ByteConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[TypeConverter(typeof(byte))]
44
public class ByteConverter : ITypeConverter
55
{
6-
public bool TryParse(string value, out object result)
6+
public bool TryParse(string value, object originalValue, out object result)
77
{
88
if (byte.TryParse(value, out var b))
99
{

Assets/Kekser/UnityCVar/Converter/CharConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[TypeConverter(typeof(char))]
44
public class CharConverter : ITypeConverter
55
{
6-
public bool TryParse(string value, out object result)
6+
public bool TryParse(string value, object originalValue, out object result)
77
{
88
if (char.TryParse(value, out var s))
99
{

Assets/Kekser/UnityCVar/Converter/DecimalConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Kekser.UnityCVar.Converter
55
[TypeConverter(typeof(decimal))]
66
public class DecimalConverter : ITypeConverter
77
{
8-
public bool TryParse(string value, out object result)
8+
public bool TryParse(string value, object originalValue, out object result)
99
{
1010
if (decimal.TryParse(value, NumberStyles.Float, CultureInfo.InvariantCulture, out var s))
1111
{

Assets/Kekser/UnityCVar/Converter/DoubleConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Kekser.UnityCVar.Converter
55
[TypeConverter(typeof(double))]
66
public class DoubleConverter : ITypeConverter
77
{
8-
public bool TryParse(string value, out object result)
8+
public bool TryParse(string value, object originalValue, out object result)
99
{
1010
if (double.TryParse(value, NumberStyles.Float, CultureInfo.InvariantCulture, out var d))
1111
{

Assets/Kekser/UnityCVar/Converter/FloatConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Kekser.UnityCVar.Converter
55
[TypeConverter(typeof(float))]
66
public class FloatConverter : ITypeConverter
77
{
8-
public bool TryParse(string value, out object result)
8+
public bool TryParse(string value, object originalValue, out object result)
99
{
1010
if (float.TryParse(value, NumberStyles.Float, CultureInfo.InvariantCulture, out var f))
1111
{

Assets/Kekser/UnityCVar/Converter/ITypeConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
public interface ITypeConverter
44
{
5-
bool TryParse(string value, out object result);
5+
bool TryParse(string value, object originalValue, out object result);
66
string ToString(object value);
77
}
88
}

0 commit comments

Comments
 (0)