make number arguments resolve calculations

Author: Elektryk-Andrzej

ArgumentSystem/Arguments/FloatArgument.cs

@@ -4,7 +4,6 @@
 using SER.Helpers.Exceptions;
 using SER.Helpers.ResultSystem;
 using SER.TokenSystem.Tokens;
-using SER.TokenSystem.Tokens.Interfaces;
 using SER.ValueSystem;
 using Random = UnityEngine.Random;
 
@@ -57,40 +56,20 @@ public DynamicTryGet<float> GetConvertSolution(BaseToken token)
     {
         if (token is NumberToken number)
         {
-            return VerifyRange((float)number.Value.ExactValue);
+            return VerifyRange(number.Value.ExactValue);
         }
-        
-        if (token is not IValueCapableToken<LiteralValue>)
-        {
-            return $"Value '{token.RawRep}' cannot represent a number.";
-        }
-        
-        if (TryParse(token).WasSuccessful(out var value))
-        {
-            return value;
-        }
-
-        return new(() => TryParse(token));
-    }
-
-    private TryGet<float> TryParse(BaseToken token)
-    {
-        if (token.TryGetLiteralValue<NumberValue>().HasErrored(out var error, out var value))
-        {
-            return error;
-        }
-
-        return VerifyRange((float)value.ExactValue);
+        return new(() => token.TryGetLiteralValue<NumberValue>().OnSuccess(VerifyRange));
     }
 
-    private TryGet<float> VerifyRange(float value)
+    private TryGet<float> VerifyRange(NumberValue value)
     {
-        if (value < _minValue)
+        var result = (float)value.ExactValue;
+        if (result < _minValue)
             return $"Value {value} is lower than allowed minimum value {_minValue}.";
 
-        if (value > _maxValue)
+        if (result > _maxValue)
             return $"Value {value} is higher than allowed maximum value {_maxValue}.";
 
-        return value;
+        return result;
     }
 }

ArgumentSystem/Arguments/IntArgument.cs

@@ -3,7 +3,6 @@
 using SER.Helpers.Exceptions;
 using SER.Helpers.ResultSystem;
 using SER.TokenSystem.Tokens;
-using SER.TokenSystem.Tokens.Interfaces;
 using SER.ValueSystem;
 using UnityEngine;
 
@@ -54,43 +53,21 @@ public override string InputDescription
     [UsedImplicitly]
     public DynamicTryGet<int> GetConvertSolution(BaseToken token)
     {
-        if (token is NumberToken numberToken)
+        if (token is NumberToken number)
         {
-            return VerifyRange(numberToken.Value);
+            return VerifyRange(number.Value.ExactValue);
         }
-        
-        if (token is not IValueCapableToken<LiteralValue>)
-        {
-            return $"Value '{token.RawRep}' cannot represent a number.";
-        }
-        
-        if (TryParse(token).WasSuccessful(out var finalValue))
-        {
-            return finalValue;
-        }
-
-        return new(() => TryParse(token));
+        return new(() => token.TryGetLiteralValue<NumberValue>().OnSuccess(VerifyRange));
     }
 
-    private TryGet<int> TryParse(BaseToken token)
-    {
-        if (token.TryGetLiteralValue<NumberValue>().HasErrored(out var error, out var value))
-        {
-            return new Result(false, error) + $"Value '{token.RawRep}' does not represent a valid number.";
-        }
-        
-        return VerifyRange(value);
-    }
-    
-    private TryGet<int> VerifyRange(NumberValue input)
+    private TryGet<int> VerifyRange(NumberValue value)
     {
-        var result = (int)input.ExactValue;
-                
+        var result = (int)value.ExactValue;
         if (result < _minValue)
-            return $"Value '{result}' is lower than allowed minimum value {_minValue}.";
-                
+            return $"Value {value} is lower than allowed minimum value {_minValue}.";
+            
         if (result > _maxValue)
-            return $"Value '{result}' is higher than allowed maximum value {_maxValue}.";
+            return $"Value {value} is higher than allowed maximum value {_maxValue}.";
 
         return result;
     }