nrt refac iaddress

Author: Stepami

src/Application/HydraScript.Application.CodeGeneration/Visitors/InstructionProvider.cs

@@ -168,7 +168,7 @@ public AddressedInstructions Visit(WhileStatement visitable)
         }
 
         result.AddRange(visitable.Statement.Accept(This));
-        for (var address = result.Start; address != null; address = address?.Next)
+        for (var address = result.Start; address != null; address = address.Next)
         {
             if (result[address] is Goto { JumpType: not null } g)
             {
@@ -222,7 +222,7 @@ public AddressedInstructions Visit(IfStatement visitable)
         if (visitable.HasElseBlock())
             result.AddRange(visitable.Else?.Accept(This) ?? []);
 
-        for (var address = result.Start; address != null; address = address?.Next)
+        for (var address = result.Start; address != null; address = address.Next)
         {
             if (result[address] is Goto { JumpType: InsideStatementJumpType.Break } g)
                 g.SetJump(endBlockLabel);

src/Domain/HydraScript.Domain.BackEnd/AddressedInstructions.cs

@@ -54,7 +54,7 @@ private void AddWithAddress(IExecutableInstruction instruction, IAddress newAddr
 
     public void AddRange(AddressedInstructions instructions)
     {
-        for (var address = instructions.Start; address != null; address = address?.Next)
+        for (var address = instructions.Start; address != null; address = address.Next)
         {
             AddWithAddress(instructions[address], address);
         }

src/Domain/HydraScript.Domain.BackEnd/IAddress.cs

@@ -2,7 +2,7 @@ namespace HydraScript.Domain.BackEnd;
 
 public interface IAddress : IEquatable<IAddress>
 {
-    public IAddress Next { get; set; }
+    public IAddress? Next { get; set; }
 
     public string Name { get; }
 }

src/Domain/HydraScript.Domain.BackEnd/IExecutableInstruction.cs

@@ -3,6 +3,5 @@ namespace HydraScript.Domain.BackEnd;
 public interface IExecutableInstruction
 {
     public IAddress Address { get; set; }
-    public IAddress Execute(IExecuteParams executeParams);
-    public bool End { get; }
+    public IAddress? Execute(IExecuteParams executeParams);
 }

src/Domain/HydraScript.Domain.BackEnd/Impl/Addresses/HashAddress.cs

@@ -9,7 +9,7 @@ public class HashAddress(int seed) : IAddress
 
     private readonly Guid _id = Guid.NewGuid();
 
-    public IAddress Next { get; set; } = default!;
+    public IAddress? Next { get; set; }
 
     public string Name
     {

src/Domain/HydraScript.Domain.BackEnd/Impl/Addresses/Label.cs

@@ -4,7 +4,7 @@ public class Label(string name) : IAddress
 {
     public string Name { get; } = name;
 
-    public IAddress Next { get; set; } = default!;
+    public IAddress? Next { get; set; }
 
     public bool Equals(IAddress? other) =>
         other is Label label &&

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

@@ -1,23 +1,14 @@
 namespace HydraScript.Domain.BackEnd.Impl.Instructions;
 
-public abstract class BlockLabel : Instruction
+public abstract class BlockLabel(
+    BlockLabel.BlockPosition blockPosition,
+    BlockType blockType,
+    string blockId) : Instruction
 {
-    private readonly BlockPosition _blockPosition;
-    private readonly BlockType _blockType;
-    private readonly string _blockId;
-
-    protected BlockLabel(BlockPosition blockPosition, BlockType blockType, string blockId)
-    {
-        _blockPosition = blockPosition;
-        _blockType = blockType;
-        _blockId = blockId;
-    }
-
-    public override IAddress Execute(IExecuteParams executeParams) =>
-        Address.Next;
+    public override IAddress? Execute(IExecuteParams executeParams) => Address.Next;
 
     protected override string ToStringInternal() =>
-        $"{_blockPosition}{_blockType} {_blockId}";
+        $"{blockPosition}{blockType} {blockId}";
 
     protected enum BlockPosition
     {
@@ -33,14 +24,8 @@ public enum BlockType
     Condition
 }
 
-public class BeginBlock : BlockLabel
-{
-    public BeginBlock(BlockType blockType, string blockId) :
-        base(BlockPosition.Begin, blockType, blockId) { }
-}
+public class BeginBlock(BlockType blockType, string blockId) :
+    BlockLabel(BlockPosition.Begin, blockType, blockId);
 
-public class EndBlock : BlockLabel
-{
-    public EndBlock(BlockType blockType, string blockId) :
-        base(BlockPosition.End, blockType, blockId) { }
-}
+public class EndBlock(BlockType blockType, string blockId) :
+    BlockLabel(BlockPosition.End, blockType, blockId);

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

@@ -1,15 +1,11 @@
-using HydraScript.Domain.BackEnd.Impl.Addresses;
-
 namespace HydraScript.Domain.BackEnd.Impl.Instructions;
 
 public class Halt : Instruction
 {
-    public override bool End => true;
-
-    public override IAddress Execute(IExecuteParams executeParams)
+    public override IAddress? Execute(IExecuteParams executeParams)
     {
         executeParams.Frames.Pop();
-        return new HashAddress(seed: 0);
+        return null;
     }
 
     protected override string ToStringInternal() => "End";

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

@@ -2,7 +2,7 @@ namespace HydraScript.Domain.BackEnd.Impl.Instructions;
 
 public abstract class Instruction : IExecutableInstruction
 {
-    private IAddress _address = default!;
+    private IAddress _address = null!;
 
     public IAddress Address
     {
@@ -16,9 +16,7 @@ public IAddress Address
 
     protected virtual void OnSetOfAddress(IAddress address) { }
 
-    public abstract IAddress Execute(IExecuteParams executeParams);
-    
-    public virtual bool End => false;
+    public abstract IAddress? Execute(IExecuteParams executeParams);
 
     protected abstract string ToStringInternal();
 

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

@@ -2,7 +2,7 @@ namespace HydraScript.Domain.BackEnd.Impl.Instructions;
 
 public class PopParameter(string parameter, object? defaultValue = null) : Instruction
 {
-    public override IAddress Execute(IExecuteParams executeParams)
+    public override IAddress? Execute(IExecuteParams executeParams)
     {
         var frame = executeParams.Frames.Peek();
         if (executeParams.Arguments.TryDequeue(out var argument))