small changes

Author: Elektryk-Andrzej

Code/ContextSystem/BaseContexts/LoopContext.cs

@@ -1,7 +1,6 @@
 using SER.Code.ContextSystem.Extensions;
 using SER.Code.ContextSystem.Interfaces;
 using SER.Code.ContextSystem.Structures;
-using SER.Code.ValueSystem;
 
 namespace SER.Code.ContextSystem.BaseContexts;
 

Code/ContextSystem/BaseContexts/YieldingContext.cs

@@ -1,5 +1,4 @@
 using SER.Code.ContextSystem.Interfaces;
-using SER.Code.ContextSystem.Structures;
 using SER.Code.Helpers;
 
 namespace SER.Code.ContextSystem.BaseContexts;

Code/ContextSystem/Contexter.cs

@@ -2,7 +2,6 @@
 using SER.Code.ContextSystem.CommunicationInterfaces;
 using SER.Code.ContextSystem.Contexts.Control;
 using SER.Code.ContextSystem.Interfaces;
-using SER.Code.ContextSystem.Structures;
 using SER.Code.Helpers;
 using SER.Code.Helpers.Extensions;
 using SER.Code.Helpers.ResultSystem;

Code/ContextSystem/Contexts/FunctionDefinitionContext.cs

@@ -19,12 +19,17 @@ public class FunctionDefinitionContext :
     StatementContext,
     INotRunningContext, 
     IAcceptOptionalVariableDefinitions,
-    IMayReturnValueContext
+    IMayReturnValueContext,
+    IKeywordContext
 {
     public string FunctionName { get; private set;  } = null!;
     private bool _end = false;
     private VariableToken[] _expectedVariables = [];
     private readonly List<Variable> _localVariables = [];
+
+    public string KeywordName => "func";
+    public string Description => "Defines a function.";
+    public string[] Arguments => ["[function name]"];
 
     // gets the type of value associated with a token type of a variable prefix
     // sketchy!!

Code/ContextSystem/Contexts/VariableDefinition/VariableDefinitionContext.cs

@@ -5,7 +5,6 @@
 using SER.Code.Helpers.Exceptions;
 using SER.Code.Helpers.Extensions;
 using SER.Code.Helpers.ResultSystem;
-using SER.Code.MethodSystem.BaseMethods;
 using SER.Code.TokenSystem.Structures;
 using SER.Code.TokenSystem.Tokens;
 using SER.Code.TokenSystem.Tokens.VariableTokens;
@@ -72,20 +71,10 @@ public override TryAddTokenRes TryAddToken(BaseToken token)
             return TryAddTokenRes.End();
         }
 
-        if (token is IContextableToken contextable)
+        if (token is IContextableToken contextable && 
+            contextable.GetContext(Script) is {} mainContext and IMayReturnValueContext returnValueContext)
         {
-            if (methodToken.Method is not ReturningMethod)
-            {
-                return TryAddTokenRes.Error($"Method '{token.RawRep}' does not return a value");
-            }
-            
-            var methodContext = new MethodContext(methodToken)
-            {
-                Script = Script,
-                LineNum = LineNum,
-            };
-            
-            _returnContext = (methodContext, methodContext);
+            _returnContext = (mainContext, returnValueContext);
             return TryAddTokenRes.Continue();
         }
 
@@ -108,22 +97,24 @@ protected override IEnumerator<float> Execute()
     {
         if (_returnContext.HasValue)
         {
-            var coro = _returnContext.Value.main.ExecuteBaseContext();
+            var (main, returner) = _returnContext.Value;
+            
+            var coro = main.ExecuteBaseContext();
             while (coro.MoveNext())
             {
                 yield return coro.Current;
             }
 
             Log.D("checking for returned value");
-            if (_returnContext.Value.returner.ReturnedValue is not { } value)
+            if (returner.ReturnedValue is not { } value)
             {
-                throw new ScriptRuntimeError($"Context {_returnContext.Value.main.Name} has not returned a value!");
+                throw new ScriptRuntimeError($"Context {main.Name} has not returned a value!");
             }
 
             if (value is not TValue tValue)
             {
                 throw new ScriptRuntimeError(
-                    $"Value returned by '{_returnContext.Value.main.Name}' cannot be assigned to the {varToken.RawRep} variable");
+                    $"Value returned by '{main.Name}' cannot be assigned to the {varToken.RawRep} variable");
             }
 
             Script.AddVariable(Variable.Create(varToken.Name, Value.Parse(tValue)));

Code/ContextSystem/Interfaces/IMayReturnValueContext.cs

@@ -1,5 +1,4 @@
-using SER.Code.Helpers.ResultSystem;
-using SER.Code.ValueSystem;
+using SER.Code.ValueSystem;
 
 namespace SER.Code.ContextSystem.Interfaces;
 

Code/Helpers/ExiledHelper.cs

@@ -1,6 +1,5 @@
 using LabApi.Loader;
 using MEC;
-using UnityEngine;
 using Logger = LabApi.Features.Console.Logger;
 
 namespace SER.Code.Helpers;

Code/Plugin/Commands/HelpSystem/HelpCommand.cs

@@ -3,7 +3,6 @@
 using CommandSystem;
 using SER.Code.ContextSystem.BaseContexts;
 using SER.Code.ContextSystem.Interfaces;
-using SER.Code.ContextSystem.Structures;
 using SER.Code.FlagSystem.Flags;
 using SER.Code.Helpers.Exceptions;
 using SER.Code.Helpers.Extensions;

Code/TokenSystem/Structures/IContextableToken.cs

@@ -1,5 +1,4 @@
 using SER.Code.ContextSystem.BaseContexts;
-using SER.Code.Helpers.ResultSystem;
 using SER.Code.ScriptSystem;
 
 namespace SER.Code.TokenSystem.Structures;

Code/TokenSystem/Tokenizer.cs

@@ -27,7 +27,7 @@ public static class Tokenizer
         typeof(CollectionVariableToken),
         typeof(ReferenceVariableToken),
         typeof(DurationToken),
-        typeof(FunctionDefinitionToken)
+        typeof(RunFunctionToken)
     ];
 
     public static readonly Type[] OrderedImportanceTokensFromCollectionSlices =