Skip to content

Commit 93a3e98

Browse files
make errors in OnSuccess be not required
1 parent a4fb43f commit 93a3e98

9 files changed

Lines changed: 15 additions & 15 deletions

File tree

Code/ArgumentSystem/Arguments/FloatArgument.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public DynamicTryGet<float> GetConvertSolution(BaseToken token)
5858
return VerifyRange(number.Value.Value);
5959
}
6060

61-
return new(() => token.TryGetLiteralValue<NumberValue>().OnSuccess(VerifyRange, null));
61+
return new(() => token.TryGetLiteralValue<NumberValue>().OnSuccess(VerifyRange));
6262
}
6363

6464
private TryGet<float> VerifyRange(NumberValue value)

Code/ArgumentSystem/Arguments/IntArgument.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public DynamicTryGet<int> GetConvertSolution(BaseToken token)
5656
{
5757
return VerifyRange(number.Value.Value);
5858
}
59-
return new(() => token.TryGetLiteralValue<NumberValue>().OnSuccess(VerifyRange, null));
59+
return new(() => token.TryGetLiteralValue<NumberValue>().OnSuccess(VerifyRange));
6060
}
6161

6262
private TryGet<int> VerifyRange(NumberValue value)

Code/ArgumentSystem/Arguments/IsValidReferenceArgument.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ public DynamicTryGet<bool> GetConvertSolution(BaseToken token)
1919
return $"Value '{token.RawRep}' is not a reference.";
2020
}
2121

22-
return new(() => func().OnSuccess(v => v.IsValid, null));
22+
return new(() => func().OnSuccess(v => v.IsValid));
2323
}
2424
}

Code/ArgumentSystem/Arguments/LooseReferenceArgument.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public virtual DynamicTryGet<object> GetConvertSolution(BaseToken token)
2020
return $"Value '{token.RawRep}' does not represent a valid reference.";
2121
}
2222

23-
return new(() => get().OnSuccess(rv => TryParse(rv, type), null));
23+
return new(() => get().OnSuccess(rv => TryParse(rv, type)));
2424
}
2525

2626
public TryGet<object> TryParse(ReferenceValue value, Type targetType)
@@ -48,7 +48,7 @@ public class ReferenceArgument<TValue>(string name) : LooseReferenceArgument(nam
4848
return $"Value '{token.RawRep}' does not represent a valid reference.";
4949
}
5050

51-
return new(() => get().OnSuccess(TryParse, null));
51+
return new(() => get().OnSuccess(TryParse));
5252
}
5353

5454
public static TryGet<TValue> TryParse(ReferenceValue value)

Code/ArgumentSystem/Arguments/PlayersArgument.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public DynamicTryGet<Player[]> GetConvertSolution(BaseToken token)
2626
return $"Value '{token.RawRep}' does not represent a valid player variable.";
2727
}
2828

29-
return new(() => get().OnSuccess(v => v.Players, null));
29+
return new(() => get().OnSuccess(v => v.Players));
3030
}
3131
}
3232

Code/ArgumentSystem/Arguments/TextArgument.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public DynamicTryGet<string> GetConvertSolution(BaseToken token)
1919
{
2020
if (token is TextToken textToken)
2121
{
22-
return new(() => textToken.GetDynamicResolver().Invoke().OnSuccess(SpaceCheck, null));
22+
return new(() => textToken.GetDynamicResolver().Invoke().OnSuccess(SpaceCheck));
2323
}
2424

2525
if (token is not IValueToken valToken || !valToken.CapableOf<LiteralValue>(out var get))
@@ -34,10 +34,10 @@ public DynamicTryGet<string> GetConvertSolution(BaseToken token)
3434

3535
if (valToken.IsConstant)
3636
{
37-
return SpaceCheck(get().OnSuccess(v => v.StringRep, null));
37+
return SpaceCheck(get().OnSuccess(v => v.StringRep));
3838
}
3939

40-
return new(() => get().OnSuccess(v => SpaceCheck(v.StringRep), null));
40+
return new(() => get().OnSuccess(v => SpaceCheck(v.StringRep)));
4141

4242
TryGet<string> SpaceCheck(string value)
4343
{

Code/Extensions/SerExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ public static TryGet<TOut> SuccessTryCast<TIn, TOut>(this TryGet<TIn> value)
1313
where TIn : notnull
1414
where TOut : TIn
1515
{
16-
return value.OnSuccess(v => v.TryCast<TOut>(), null);
16+
return value.OnSuccess(v => v.TryCast<TOut>());
1717
}
1818

1919
public static TryGet<TOut> SuccessTryCast<TOut>(this TryGet<Value> value) where TOut : Value
2020
{
21-
return value.OnSuccess(v => v.TryCast<TOut>(), null);
21+
return value.OnSuccess(v => v.TryCast<TOut>());
2222
}
2323

2424
public static TryGet<TOut> TryCast<TOut>(this object value, string rawRep = "")

Code/Helpers/ResultSystem/TryGet.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public static TryGet<TValue> Success(TValue value)
8484
}
8585

8686
[Pure]
87-
public TryGet<TTarget> OnSuccess<TTarget>(Func<TValue, TTarget> transform, string? mainErr)
87+
public TryGet<TTarget> OnSuccess<TTarget>(Func<TValue, TTarget> transform, string? mainErr = null)
8888
{
8989
if (HasErrored(out var error, out var val))
9090
{
@@ -98,7 +98,7 @@ public TryGet<TTarget> OnSuccess<TTarget>(Func<TValue, TTarget> transform, strin
9898
}
9999

100100
[Pure]
101-
public TryGet<TTarget> OnSuccess<TTarget>(Func<TValue, TryGet<TTarget>> transform, string? mainErr)
101+
public TryGet<TTarget> OnSuccess<TTarget>(Func<TValue, TryGet<TTarget>> transform, string? mainErr = null)
102102
{
103103
if (HasErrored(out var error, out var val))
104104
{

Code/TokenSystem/Tokens/VariableTokens/VariableToken.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public abstract class VariableToken<TVariable, TValue> : VariableToken, IValueTo
5050
return Script.TryGetVariable<TVariable>(this);
5151
}
5252

53-
public TryGet<TValue> ExactValue => TryGetVariable().OnSuccess(variable => variable.Value, null);
53+
public TryGet<TValue> ExactValue => TryGetVariable().OnSuccess(variable => variable.Value);
5454

5555
protected override IParseResult InternalParse(Script scr)
5656
{
@@ -70,7 +70,7 @@ protected override IParseResult InternalParse(Script scr)
7070

7171
public TryGet<Value> Value()
7272
{
73-
return TryGetVariable().OnSuccess(Value (variable) => variable.Value, null);
73+
return TryGetVariable().OnSuccess(Value (variable) => variable.Value);
7474
}
7575

7676
public TypeOfValue PossibleValues => new TypeOfValue<TValue>();

0 commit comments

Comments
 (0)