Merge branch 'main' of https://github.com/ScriptedEvents/ScriptedEventsReloaded

Author: Tosoks67

Code/ArgumentSystem/Arguments/BoolArgument.cs

@@ -34,7 +34,7 @@ public DynamicTryGet<bool> GetConvertSolution(BaseToken token)
         }
 
         return valueToken.IsConstant
-            ? new(get().OnSuccess(v => v.Value))
-            : new(() => get().OnSuccess(v => v.Value));
+            ? new(get().OnSuccess(v => v.Value, error))
+            : new(() => get().OnSuccess(v => v.Value, error));
     }
 }

Code/ArgumentSystem/Arguments/DurationArgument.cs

@@ -15,16 +15,17 @@ public class DurationArgument(string name) : Argument(name)
     [UsedImplicitly]
     public DynamicTryGet<TimeSpan> GetConvertSolution(BaseToken token)
     {
+        Result rs = $"Value '{token.RawRep}' is not a duration.";
         if (token is not IValueToken valueToken || !valueToken.CanReturn<DurationValue>(out var get))
         {
-            return $"Value '{token.RawRep}' is not a duration.";
+            return rs;
         }
 
         if (valueToken.IsConstant)
         {
-            return get().OnSuccess(v => v.Value);
+            return get().OnSuccess(v => v.Value, rs);
         }
 
-        return new(() => get().OnSuccess(v => v.Value));
+        return new(() => get().OnSuccess(v => v.Value, rs));
     }
 }

Code/ArgumentSystem/Arguments/FloatArgument.cs

@@ -58,7 +58,7 @@ public DynamicTryGet<float> GetConvertSolution(BaseToken token)
             return VerifyRange(number.Value.Value);
         }
 
-        return new(() => token.TryGetLiteralValue<NumberValue>().OnSuccess(VerifyRange));
+        return new(() => token.TryGetLiteralValue<NumberValue>().OnSuccess(VerifyRange, null));
     }
 
     private TryGet<float> VerifyRange(NumberValue value)

Code/ArgumentSystem/Arguments/IntArgument.cs

@@ -56,7 +56,7 @@ public DynamicTryGet<int> GetConvertSolution(BaseToken token)
         {
             return VerifyRange(number.Value.Value);
         }
-        return new(() => token.TryGetLiteralValue<NumberValue>().OnSuccess(VerifyRange));
+        return new(() => token.TryGetLiteralValue<NumberValue>().OnSuccess(VerifyRange, null));
     }
 
     private TryGet<int> VerifyRange(NumberValue value)

Code/ArgumentSystem/Arguments/IsValidReferenceArgument.cs

@@ -19,6 +19,6 @@ public DynamicTryGet<bool> GetConvertSolution(BaseToken token)
             return $"Value '{token.RawRep}' is not a reference.";
         }
 
-        return new(() => func().OnSuccess(v => v.IsValid));
+        return new(() => func().OnSuccess(v => v.IsValid, null));
     }
 }

Code/ArgumentSystem/Arguments/PlayersArgument.cs

@@ -27,7 +27,7 @@ public DynamicTryGet<Player[]> GetConvertSolution(BaseToken token)
             return $"Value '{token.RawRep}' does not represent a valid player variable.";
         }
 
-        return new(() => get().OnSuccess(v => v.Players));
+        return new(() => get().OnSuccess(v => v.Players, null));
     }
 }
 

Code/ArgumentSystem/Arguments/ReferenceArgument.cs

@@ -20,7 +20,7 @@ public DynamicTryGet<TValue> GetConvertSolution(BaseToken token)
             return $"Value '{token.RawRep}' does not represent a valid reference.";
         }
 
-        return new(() => get().OnSuccess(TryParse));
+        return new(() => get().OnSuccess(TryParse, null));
     }
 
     public static TryGet<TValue> TryParse(ReferenceValue value)

Code/ArgumentSystem/Arguments/TextArgument.cs

@@ -27,9 +27,9 @@ public DynamicTryGet<string> GetConvertSolution(BaseToken token)
 
         if (valToken.IsConstant)
         {
-            return get().OnSuccess(v => v.StringRep);
+            return get().OnSuccess(v => v.StringRep, null);
         }
 
-        return new(() => get().OnSuccess(v => v.StringRep));
+        return new(() => get().OnSuccess(v => v.StringRep, null));
     }
 }

Code/ContextSystem/BaseContexts/YieldingContext.cs

@@ -1,9 +1,15 @@
-namespace SER.Code.ContextSystem.BaseContexts;
+using SER.Code.Helpers;
+
+namespace SER.Code.ContextSystem.BaseContexts;
 
 public abstract class YieldingContext : Context
 {
     public IEnumerator<float> Run()
     {
+        var prof = Script.Profile is not null 
+            ? new Profile(Script.Profile, $"running YieldingContext {Name}")
+            : null;
+        
         if (LineNum.HasValue)
         {
             Script.CurrentLine = LineNum.Value;
@@ -14,6 +20,8 @@ public IEnumerator<float> Run()
         {
             yield return enumerator.Current;
         }
+
+        prof?.Stop();
     }
 
     protected abstract IEnumerator<float> Execute();

Code/ContextSystem/Contexts/Control/ElifStatementContext.cs

@@ -3,6 +3,7 @@
 using SER.Code.ContextSystem.Structures;
 using SER.Code.Helpers;
 using SER.Code.Helpers.Exceptions;
+using SER.Code.Helpers.Extensions;
 using SER.Code.Helpers.ResultSystem;
 using SER.Code.TokenSystem.Tokens;
 
@@ -22,6 +23,8 @@ public class ElifStatementContext : StatementContext, IStatementExtender, IExten
 
     private readonly List<BaseToken> _condition = [];
 
+    private NumericExpressionReslover.CompiledExpression _expression;
+    
     public override TryAddTokenRes TryAddToken(BaseToken token)
     {
         _condition.Add(token);
@@ -30,16 +33,29 @@ public override TryAddTokenRes TryAddToken(BaseToken token)
 
     public override Result VerifyCurrentState()
     {
+        if (NumericExpressionReslover.CompileExpression(_condition.ToArray())
+            .HasErrored(out var error, out var cond))
+        {
+            return error;
+        }
+        
+        _expression = cond;
+
         return Result.Assert(
             _condition.Count > 0,
             "An elif statement expects to have a condition, but none was provided!");
     }
 
     protected override IEnumerator<float> Execute()
     {
-        if (NumericExpressionReslover.EvalCondition(_condition.ToArray(), Script).HasErrored(out var error, out var result))
+        if (_expression.Evaluate().HasErrored(out var error, out var objResult))
+        {
+            throw new ScriptRuntimeError(error);
+        }
+
+        if (objResult is not bool result)
         {
-            throw new ScriptRuntimeError($"'elif' statement condition error: {error}");
+            throw new ScriptRuntimeError($"An elif statement condition must evaluate to a boolean value, but received {objResult.FriendlyTypeName()}");
         }
 
         if (!result)