remove return address from Frame.cs

Author: Stepami

src/Domain/HydraScript.Domain.BackEnd/Frame.cs

@@ -1,11 +1,9 @@
 namespace HydraScript.Domain.BackEnd;
 
-public class Frame(IAddress returnAddress, Frame? parentFrame = null)
+public class Frame(Frame? parentFrame = null)
 {
     private readonly Dictionary<string, object?> _variables = new();
 
-    public IAddress ReturnAddress { get; } = returnAddress;
-
     public object? this[string id]
     {
         get => _variables.TryGetValue(id, out var value)

src/Domain/HydraScript.Domain.BackEnd/Impl/Instructions/Return.cs

@@ -2,7 +2,7 @@ namespace HydraScript.Domain.BackEnd.Impl.Instructions;
 
 public class Return(IValue? value = null) : Instruction
 {
-    public override IAddress Execute(IExecuteParams executeParams)
+    public override IAddress? Execute(IExecuteParams executeParams)
     {
         var frame = executeParams.Frames.Pop();
         var call = executeParams.CallStack.Pop();
@@ -11,7 +11,7 @@ public override IAddress Execute(IExecuteParams executeParams)
             executeParams.Frames.Peek()[call.Where] = value.Get(frame);
         }
 
-        return frame.ReturnAddress;
+        return call.From.Next;
     }
 
     protected override string ToStringInternal() =>

src/Domain/HydraScript.Domain.BackEnd/Impl/Instructions/WithAssignment/CallFunction.cs

@@ -12,7 +12,7 @@ protected override void OnSetOfAddress(IAddress address)
 
     public override IAddress Execute(IExecuteParams executeParams)
     {
-        var frame = new Frame(Address.Next!, executeParams.Frames.Peek());
+        var frame = new Frame(executeParams.Frames.Peek());
         executeParams.CallStack.Push(new Call(Address, function, Left));
         executeParams.Frames.Push(frame);
         return function.Start;

src/Domain/HydraScript.Domain.BackEnd/Impl/VirtualMachine.cs

@@ -6,7 +6,7 @@ public class VirtualMachine(IOutputWriter writer) : IVirtualMachine
 
     public void Run(AddressedInstructions instructions)
     {
-        ExecuteParams.Frames.Push(new Frame(instructions.Start));
+        ExecuteParams.Frames.Push(new Frame());
 
         var address = instructions.Start;
         while (address is not null)

tests/HydraScript.UnitTests/Domain/BackEnd/AsStringTests.cs

@@ -12,7 +12,7 @@ public void Execute_String_NoQuotes(VirtualMachine vm)
     {
         // Arrange
         AddressedInstructions program = [new AsString(new Constant("string"))];
-        vm.ExecuteParams.Frames.Push(new Frame(program.Start));
+        vm.ExecuteParams.Frames.Push(new Frame());
 
         // Act
         program[program.Start].Execute(vm.ExecuteParams);

tests/HydraScript.UnitTests/Domain/BackEnd/VirtualMachineTests.cs

@@ -17,7 +17,7 @@ public class VirtualMachineTests
     public void CorrectPrintToOutTest([Frozen] IOutputWriter writer, IExecuteParams exParams)
     {
         exParams.CallStack.Returns(new Stack<Call>());
-        exParams.Frames.Returns(new Stack<Frame>([new Frame(new HashAddress(0))]));
+        exParams.Frames.Returns(new Stack<Frame>([new Frame()]));
         exParams.Arguments.Returns(new Queue<object?>());
 
         var print = new Print(new Constant(223))
@@ -95,7 +95,7 @@ public void VirtualMachineHandlesRecursionTest(VirtualMachine vm)
     [Theory, AutoHydraScriptData]
     public void CreateArrayReservesCertainSpaceTest(ExecuteParams vm)
     {
-        vm.Frames.Push(new Frame(new HashAddress(0)));
+        vm.Frames.Push(new Frame());
 
         var createArray = new CreateArray("arr", 6)
         {