make TryGet<Context> into Context

Elektryk-Andrzej · Elektryk-Andrzej · commit 753d642b4759 · 2026-01-15T13:39:34.000+01:00
diff --git a/Code/ContextSystem/Contexter.cs b/Code/ContextSystem/Contexter.cs
@@ -136,9 +136,8 @@ List<Context> contexts
         {
             return rs + "The beginning of the line is incorrectly strucutred.";
         }
-        
-        if (contextable.TryGetContext(scr).HasErrored(out var contextError, out var context))
-            return rs + contextError;
+
+        var context = contextable.GetContext(scr);
 
         foreach (var token in tokens.Skip(1))
         {
diff --git a/Code/ContextSystem/Contexts/RunFunctionContext.cs b/Code/ContextSystem/Contexts/RunFunctionContext.cs
@@ -11,14 +11,13 @@
 namespace SER.Code.ContextSystem.Contexts;
 
 [UsedImplicitly]
-public class RunFunctionContext : YieldingContext, IKeywordContext
+public class RunFunctionContext : YieldingContext, IMayReturnValueContext
 {
     private FunctionDefinitionContext? _functionDefinitionContext;
     private readonly List<IValueToken> _providedValues = [];
-    
-    public string KeywordName => "run";
-    public string Description => "Runs a local function with a given name.";
-    public string[] Arguments => ["[function name]"];
+
+    public TypeOfValue? Returns => _functionDefinitionContext?.Returns;
+    public Value? ReturnedValue => _functionDefinitionContext?.ReturnedValue;
     
     public override TryAddTokenRes TryAddToken(BaseToken token)
     {
diff --git a/Code/ContextSystem/Contexts/VariableDefinition/VariableDefinitionContext.cs b/Code/ContextSystem/Contexts/VariableDefinition/VariableDefinitionContext.cs
@@ -6,6 +6,7 @@
 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;
 using SER.Code.ValueSystem;
@@ -71,7 +72,7 @@ public override TryAddTokenRes TryAddToken(BaseToken token)
             return TryAddTokenRes.End();
         }
 
-        if (token is MethodToken methodToken)
+        if (token is IContextableToken contextable)
         {
             if (methodToken.Method is not ReturningMethod)
             {
diff --git a/Code/TokenSystem/Structures/IContextableToken.cs b/Code/TokenSystem/Structures/IContextableToken.cs
@@ -6,5 +6,5 @@ namespace SER.Code.TokenSystem.Structures;
 
 public interface IContextableToken
 {
-    public TryGet<Context> TryGetContext(Script scr);
+    public Context GetContext(Script scr);
 }
diff --git a/Code/TokenSystem/Tokens/CommentToken.cs b/Code/TokenSystem/Tokens/CommentToken.cs
@@ -15,7 +15,7 @@ protected override IParseResult InternalParse(Script scr)
             : new Ignore();
     }
 
-    public TryGet<Context> TryGetContext(Script scr)
+    public Context GetContext(Script scr)
     {
         return new NoOperationContext
         {
diff --git a/Code/TokenSystem/Tokens/FlagArgumentToken.cs b/Code/TokenSystem/Tokens/FlagArgumentToken.cs
@@ -15,7 +15,7 @@ protected override IParseResult InternalParse(Script scr)
             : new Ignore();
     }
 
-    public TryGet<Context> TryGetContext(Script scr)
+    public Context GetContext(Script scr)
     {
         return new NoOperationContext
         {
diff --git a/Code/TokenSystem/Tokens/FlagToken.cs b/Code/TokenSystem/Tokens/FlagToken.cs
@@ -15,7 +15,7 @@ protected override IParseResult InternalParse(Script scr)
             : new Ignore();
     }
 
-    public TryGet<Context> TryGetContext(Script scr)
+    public Context GetContext(Script scr)
     {
         return new NoOperationContext
         {
diff --git a/Code/TokenSystem/Tokens/FunctionDefinitionToken.cs b/Code/TokenSystem/Tokens/FunctionDefinitionToken.cs
@@ -8,9 +8,9 @@ namespace SER.Code.TokenSystem.Tokens;
 
 public class FunctionDefinitionToken : BaseToken, IContextableToken
 {
-    public TryGet<Context> TryGetContext(Script scr)
+    public Context GetContext(Script scr)
     {
-        return new FunctionDefinitionContext
+        return new RunFunctionContext
         {
             LineNum = LineNum,
             Script = scr
@@ -19,7 +19,7 @@ public TryGet<Context> TryGetContext(Script scr)
 
     protected override IParseResult InternalParse(Script scr)
     {
-        if (RawRep != "func")
+        if (RawRep != "run")
         {
             return new Ignore();
         }
diff --git a/Code/TokenSystem/Tokens/KeywordToken.cs b/Code/TokenSystem/Tokens/KeywordToken.cs
@@ -32,7 +32,7 @@ protected override IParseResult InternalParse(Script scr)
             : new Ignore();
     }
 
-    public TryGet<Context> TryGetContext(Script scr)
+    public Context GetContext(Script scr)
     {
         return Context.Create(_keywordType!, (scr, LineNum));
     }
diff --git a/Code/TokenSystem/Tokens/MethodToken.cs b/Code/TokenSystem/Tokens/MethodToken.cs
@@ -24,7 +24,7 @@ protected override IParseResult InternalParse(Script scr)
         return new Success();
     }
 
-    public TryGet<Context> TryGetContext(Script scr)
+    public Context GetContext(Script scr)
     {
         return new MethodContext(this)
         {
diff --git a/Code/TokenSystem/Tokens/VariableTokens/CollectionVariableToken.cs b/Code/TokenSystem/Tokens/VariableTokens/CollectionVariableToken.cs
@@ -11,7 +11,7 @@ public class CollectionVariableToken : VariableToken<CollectionVariable, Collect
 {
     public static string Example => "&collection";
 
-    public override TryGet<Context> TryGetContext(Script scr)
+    public override Context GetContext(Script scr)
     {
         return new CollectionVariableDefinitionContext(this)
         {
diff --git a/Code/TokenSystem/Tokens/VariableTokens/LiteralVariableToken.cs b/Code/TokenSystem/Tokens/VariableTokens/LiteralVariableToken.cs
@@ -9,7 +9,7 @@ namespace SER.Code.TokenSystem.Tokens.VariableTokens;
 
 public class LiteralVariableToken : VariableToken<LiteralVariable, LiteralValue>
 {
-    public override TryGet<Context> TryGetContext(Script scr)
+    public override Context GetContext(Script scr)
     {
         return new LiteralVariableDefinitionContext(this)
         {
diff --git a/Code/TokenSystem/Tokens/VariableTokens/PlayerVariableToken.cs b/Code/TokenSystem/Tokens/VariableTokens/PlayerVariableToken.cs
@@ -11,7 +11,7 @@ public class PlayerVariableToken : VariableToken<PlayerVariable, PlayerValue>
 {
     public static string Example => "@players";
 
-    public override TryGet<Context> TryGetContext(Script scr)
+    public override Context GetContext(Script scr)
     {
         return new PlayerVariableDefinitionContext(this)
         {
diff --git a/Code/TokenSystem/Tokens/VariableTokens/ReferenceVariableToken.cs b/Code/TokenSystem/Tokens/VariableTokens/ReferenceVariableToken.cs
@@ -9,7 +9,7 @@ namespace SER.Code.TokenSystem.Tokens.VariableTokens;
 
 public class ReferenceVariableToken : VariableToken<ReferenceVariable, ReferenceValue>
 {
-    public override TryGet<Context> TryGetContext(Script scr)
+    public override Context GetContext(Script scr)
     {
         return new ReferenceVariableDefinitionContext(this)
         {
diff --git a/Code/TokenSystem/Tokens/VariableTokens/VariableToken.cs b/Code/TokenSystem/Tokens/VariableTokens/VariableToken.cs
@@ -17,8 +17,8 @@ public abstract class VariableToken : BaseToken, IContextableToken
     public abstract Type VariableType { get; }
     
     public abstract Type ValueType { get; }
-    
-    public abstract TryGet<Context> TryGetContext(Script scr);
+
+    public abstract Context GetContext(Script scr);
 
     public static readonly (char prefix, Type varTypeToken)[] VariablePrefixes =
     [

Original file line number	Diff line number	Diff line change
`@@ -136,9 +136,8 @@ List<Context> contexts`
`136`	`136`	`{`
`137`	`137`	`return rs + "The beginning of the line is incorrectly strucutred.";`
`138`	`138`	`}`
`139`		`-`
`140`		`- if (contextable.TryGetContext(scr).HasErrored(out var contextError, out var context))`
`141`		`- return rs + contextError;`
	`139`	`+`
	`140`	`+ var context = contextable.GetContext(scr);`
`142`	`141`
`143`	`142`	`foreach (var token in tokens.Skip(1))`
`144`	`143`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using SER.Code.Helpers.Extensions;`
`7`	`7`	`using SER.Code.Helpers.ResultSystem;`
`8`	`8`	`using SER.Code.MethodSystem.BaseMethods;`
	`9`	`+using SER.Code.TokenSystem.Structures;`
`9`	`10`	`using SER.Code.TokenSystem.Tokens;`
`10`	`11`	`using SER.Code.TokenSystem.Tokens.VariableTokens;`
`11`	`12`	`using SER.Code.ValueSystem;`
`@@ -71,7 +72,7 @@ public override TryAddTokenRes TryAddToken(BaseToken token)`
`71`	`72`	`return TryAddTokenRes.End();`
`72`	`73`	`}`
`73`	`74`
`74`		`- if (token is MethodToken methodToken)`
	`75`	`+ if (token is IContextableToken contextable)`
`75`	`76`	`{`
`76`	`77`	`if (methodToken.Method is not ReturningMethod)`
`77`	`78`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ namespace SER.Code.TokenSystem.Structures;`
`6`	`6`
`7`	`7`	`public interface IContextableToken`
`8`	`8`	`{`
`9`		`- public TryGet<Context> TryGetContext(Script scr);`
	`9`	`+ public Context GetContext(Script scr);`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ protected override IParseResult InternalParse(Script scr)`
`15`	`15`	`: new Ignore();`
`16`	`16`	`}`
`17`	`17`
`18`		`- public TryGet<Context> TryGetContext(Script scr)`
	`18`	`+ public Context GetContext(Script scr)`
`19`	`19`	`{`
`20`	`20`	`return new NoOperationContext`
`21`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@ namespace SER.Code.TokenSystem.Tokens;`
`8`	`8`
`9`	`9`	`public class FunctionDefinitionToken : BaseToken, IContextableToken`
`10`	`10`	`{`
`11`		`- public TryGet<Context> TryGetContext(Script scr)`
	`11`	`+ public Context GetContext(Script scr)`
`12`	`12`	`{`
`13`		`- return new FunctionDefinitionContext`
	`13`	`+ return new RunFunctionContext`
`14`	`14`	`{`
`15`	`15`	`LineNum = LineNum,`
`16`	`16`	`Script = scr`
`@@ -19,7 +19,7 @@ public TryGet<Context> TryGetContext(Script scr)`
`19`	`19`
`20`	`20`	`protected override IParseResult InternalParse(Script scr)`
`21`	`21`	`{`
`22`		`- if (RawRep != "func")`
	`22`	`+ if (RawRep != "run")`
`23`	`23`	`{`
`24`	`24`	`return new Ignore();`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ protected override IParseResult InternalParse(Script scr)`
`32`	`32`	`: new Ignore();`
`33`	`33`	`}`
`34`	`34`
`35`		`- public TryGet<Context> TryGetContext(Script scr)`
	`35`	`+ public Context GetContext(Script scr)`
`36`	`36`	`{`
`37`	`37`	`return Context.Create(_keywordType!, (scr, LineNum));`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ protected override IParseResult InternalParse(Script scr)`
`24`	`24`	`return new Success();`
`25`	`25`	`}`
`26`	`26`
`27`		`- public TryGet<Context> TryGetContext(Script scr)`
	`27`	`+ public Context GetContext(Script scr)`
`28`	`28`	`{`
`29`	`29`	`return new MethodContext(this)`
`30`	`30`	`{`