begin rework

Author: Elektryk-Andrzej

Code/ContextSystem/BaseContexts/AdditionalContext.cs

@@ -0,0 +1,24 @@
+using SER.Code.Helpers;
+using SER.Code.ScriptSystem;
+
+namespace SER.Code.ContextSystem.BaseContexts;
+
+public abstract class AdditionalContext : Context
+{
+    private Safe<RunnableContext> _parentContext;
+    public RunnableContext ParentContext
+    {
+        get => _parentContext.Value;
+        set => _parentContext = value;
+    }
+    
+    public static AdditionalContext Create(Type contextType, Script scr, RunnableContext parentContext)
+    {
+        var context = (AdditionalContext)Activator.CreateInstance(contextType);
+        context.Script = scr;
+        context.ParentContext = parentContext;
+        return context;
+    }
+
+    public override string ToString() => $"{FriendlyName} attached to {ParentContext}";
+}

Code/ContextSystem/BaseContexts/Context.cs

@@ -1,4 +1,4 @@
-using SER.Code.ContextSystem.Structures;
+using SER.Code.ContextSystem.Structures;
 using SER.Code.Helpers.ResultSystem;
 using SER.Code.ScriptSystem;
 using SER.Code.TokenSystem.Tokens;
@@ -9,29 +9,18 @@ public abstract class Context
 {
     public required Script Script { get; set; } = null!;
 
-    public required uint? LineNum { get; set; }
-
-    public StatementContext? ParentContext { get; set; } = null;
-
     protected abstract string FriendlyName { get; }
 
     public abstract TryAddTokenRes TryAddToken(BaseToken token);
 
     public abstract Result VerifyCurrentState();
 
-    public static Context Create(Type contextType, (Script scr, uint? lineNum) info)
+    public static Context Create(Type contextType, Script scr)
     {
         var context = (Context)Activator.CreateInstance(contextType);
-        context.Script = info.scr;
-        context.LineNum = info.lineNum;
+        context.Script = scr;
         return context;
     }
 
-    public override string ToString()
-    {
-        if (LineNum.HasValue) 
-            return $"{FriendlyName} at line {LineNum}";
-        
-        return FriendlyName;
-    }
+    public abstract override string ToString();
 }

Code/ContextSystem/BaseContexts/RunnableContext.cs

@@ -0,0 +1,26 @@
+using SER.Code.ScriptSystem;
+
+namespace SER.Code.ContextSystem.BaseContexts;
+
+public abstract class RunnableContext : Context
+{
+    public required uint? LineNum { get; set; }
+
+    public StatementContext? ParentContext { get; set; } = null;
+
+    public static RunnableContext Create(Type contextType, Script scr, uint? lineNum )
+    {
+        var context = (RunnableContext)Activator.CreateInstance(contextType);
+        context.Script = scr;
+        context.LineNum = lineNum;
+        return context;
+    }
+
+    public override string ToString()
+    {
+        if (LineNum.HasValue) 
+            return $"{FriendlyName} at line {LineNum}";
+        
+        return FriendlyName;
+    }
+}

Code/ContextSystem/BaseContexts/StandardContext.cs

@@ -1,6 +1,6 @@
 namespace SER.Code.ContextSystem.BaseContexts;
 
-public abstract class StandardContext : Context
+public abstract class StandardContext : RunnableContext
 {
     public void Run()
     {

Code/ContextSystem/BaseContexts/StatementContext.cs

@@ -6,7 +6,7 @@ namespace SER.Code.ContextSystem.BaseContexts;
 
 public abstract class StatementContext : YieldingContext
 {
-    public readonly List<Context> Children = [];
+    public readonly List<RunnableContext> Children = [];
 
     public void SendControlMessage(ParentContextControlMessage msg)
     {

Code/ContextSystem/BaseContexts/YieldingContext.cs

@@ -3,7 +3,7 @@
 
 namespace SER.Code.ContextSystem.BaseContexts;
 
-public abstract class YieldingContext : Context
+public abstract class YieldingContext : RunnableContext
 {
     public IEnumerator<float> Run()
     {

Code/ContextSystem/Contexter.cs

@@ -15,10 +15,10 @@ namespace SER.Code.ContextSystem;
 /// </summary>
 public static class Contexter
 {
-    public static TryGet<Context[]> ContextLines(Line[] lines, Script scr)
+    public static TryGet<RunnableContext[]> ContextLines(Line[] lines, Script scr)
     {
         Stack<StatementContext> statementStack = [];
-        List<Context> contexts = [];
+        List<RunnableContext> contexts = [];
 
         List<Result> errors = [];
         foreach (var line in lines)
@@ -47,10 +47,10 @@ public static TryGet<Context[]> ContextLines(Line[] lines, Script scr)
     }
 
     private static Result TryAddResult(
-        Context context,
+        RunnableContext context,
         uint lineNum, 
         Stack<StatementContext> statementStack, 
-        List<Context> contexts
+        List<RunnableContext> contexts
     ) {
         Result rs = $"Invalid context {context}";
 
@@ -129,19 +129,20 @@ List<Context> contexts
         return true;
     }
 
-    public static TryGet<Context?> ContextLine(BaseToken[] tokens, uint? lineNum, Script scr)
+    public static TryGet<RunnableContext?> ContextLine(BaseToken[] tokens, uint? lineNum, Script scr)
     {
         Result rs = $"Line {(lineNum.HasValue ? $"{lineNum.Value} " : "")}is invalid";
 
         var firstToken = tokens.FirstOrDefault();
-        if (firstToken is null) return null as Context;
+        if (firstToken is null) return null as RunnableContext;
 
         if (firstToken is not IContextableToken contextable)
         {
             return $"'{firstToken.RawRep}' is not a valid way to start a line. Perhaps you made a typo?";
         }
 
         var context = contextable.GetContext(scr);
+        if (context is null) return context;
 
         foreach (var token in tokens.Skip(1))
         {
@@ -154,7 +155,7 @@ List<Context> contexts
         return context;
     }
 
-    private static Result HandleCurrentContext(BaseToken token, Context context, out bool endLineContexting)
+    private static Result HandleCurrentContext(BaseToken token, RunnableContext context, out bool endLineContexting)
     {
         Result rs = $"Cannot add '{token.RawRep}' to {context}";
         Log.Debug($"Handling token {token} in context {context}");

Code/ContextSystem/Contexts/Control/ReturnKeyword.cs

@@ -15,7 +15,7 @@ namespace SER.Code.ContextSystem.Contexts.Control;
 public class ReturnKeyword : StandardContext, IKeywordContext
 {
     private IValueToken? _returnValueToken;
-    private (Context main, IMayReturnValueContext returner)? _returnContext = null; 
+    private (RunnableContext main, IMayReturnValueContext returner)? _returnContext = null; 
 
     public string KeywordName => "return";
     public string Description => "Returns value when in a function.";