#201 - refac IValueFactory.cs

Author: Stepami

src/Application/HydraScript.Application.CodeGeneration/IValueFactory.cs

@@ -8,5 +8,7 @@ public interface IValueFactory
 {
     public IValue Create(ValueDto dto);
 
-    public Name CreateName(string id, bool env = false);
+    public Name CreateName(IdentifierReference id);
+
+    public Name CreateName(string id);
 }

src/Application/HydraScript.Application.CodeGeneration/Impl/ValueFactory.cs

@@ -15,14 +15,26 @@ public IValue Create(ValueDto dto) =>
             { Type: ValueDtoType.Constant, Label: not null } =>
                 new Constant(dto.Value, dto.Label),
             { Type: ValueDtoType.Name, Name: not null } =>
-                CreateName(dto.Name),
+                new Name(dto.Name, CurrentFrame),
             { Type: ValueDtoType.Env, Name: not null } =>
-                CreateName(dto.Name, env: true),
+                new EnvName(dto.Name, EnvFrame),
             _ => throw new ArgumentOutOfRangeException(nameof(dto))
         };
 
-    public Name CreateName(string id, bool env = false) =>
-        env ? new EnvName(id, EnvFrame) : new Name(id, CurrentFrame);
+    public Name CreateName(IdentifierReference id)
+    {
+        var dto = id.ToValueDto();
+        return dto switch
+        {
+            { Type: ValueDtoType.Name, Name: not null } =>
+                new Name(dto.Name, CurrentFrame),
+            { Type: ValueDtoType.Env, Name: not null } =>
+                new EnvName(dto.Name, EnvFrame),
+            _ => throw new ArgumentOutOfRangeException(nameof(dto))
+        };
+    }
+
+    public Name CreateName(string id) => new(id, CurrentFrame);
 
     private CurrentFrame CurrentFrame { get; } = new(frameContext);
 

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

@@ -245,10 +245,7 @@ public AddressedInstructions Visit(AssignmentExpression visitable)
         }
 
         if (visitable.Destination.Empty())
-        {
-            var isEnv = visitable.Destination.Id.ToValueDto().Type is ValueDtoType.Env;
-            result.OfType<Simple>().Last().Left = _valueFactory.CreateName(visitable.Destination.Id, isEnv);
-        }
+            result.OfType<Simple>().Last().Left = _valueFactory.CreateName(visitable.Destination.Id);
         else
         {
             var last = result.OfType<Simple>().Last().Left!;

src/Domain/HydraScript.Domain.BackEnd/Impl/Values/Name.cs

@@ -17,7 +17,7 @@ public bool Equals(IValue? other) =>
         other is Name that &&
         Id == that.Id;
 
-    internal static IFrame NullFrameInstance { get; } = new NullFrame();
+    internal static readonly IFrame NullFrameInstance = new NullFrame();
 
     private sealed class NullFrame : IFrame
     {

src/Domain/HydraScript.Domain.FrontEnd/Parser/Impl/Ast/Nodes/Expressions/ComplexLiterals/ArrayLiteral.cs

@@ -1,3 +1,5 @@
+using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Expressions.PrimaryExpressions;
+
 namespace HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Expressions.ComplexLiterals;
 
 [AutoVisitable<IAbstractSyntaxTreeNode>]
@@ -12,9 +14,9 @@ public partial class ArrayLiteral : ComplexLiteral
 
     protected override string NullIdPrefix => "arr";
 
-    public override string Id => Parent is AssignmentExpression assignment
+    public override IdentifierReference Id => new(Parent is AssignmentExpression assignment
         ? assignment.Destination.Id
-        : NullId;
+        : NullId);
 
     public ArrayLiteral(List<Expression> expressions)
     {

src/Domain/HydraScript.Domain.FrontEnd/Parser/Impl/Ast/Nodes/Expressions/ComplexLiterals/ComplexLiteral.cs

@@ -1,4 +1,5 @@
 using Cysharp.Text;
+using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Expressions.PrimaryExpressions;
 
 namespace HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Expressions.ComplexLiterals;
 
@@ -15,5 +16,5 @@ protected string NullId
         }
     }
 
-    public abstract string Id { get; }
+    public abstract IdentifierReference Id { get; }
 }

src/Domain/HydraScript.Domain.FrontEnd/Parser/Impl/Ast/Nodes/Expressions/ComplexLiterals/ObjectLiteral.cs

@@ -1,3 +1,5 @@
+using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Expressions.PrimaryExpressions;
+
 namespace HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Expressions.ComplexLiterals;
 
 [AutoVisitable<IAbstractSyntaxTreeNode>]
@@ -12,7 +14,7 @@ public partial class ObjectLiteral : ComplexLiteral
 
     protected override string NullIdPrefix => "obj";
 
-    public override string Id
+    public override IdentifierReference Id
     {
         get
         {
@@ -22,7 +24,7 @@ public override string Id
             if (Parent is WithExpression{Parent:AssignmentExpression withAssignment})
                 return withAssignment.Destination.Id;
 
-            return NullId;
+            return new(NullId);
         }
     }
 

tests/HydraScript.UnitTests/Domain/FrontEnd/ComplexLiteralTests.cs

@@ -9,7 +9,7 @@ public void Id_DifferentType_StartsWithExpected(ComplexLiteral complexLiteral, s
     {
         var complexLiteralId = complexLiteral.Id;
         testOutputHelper.WriteLine(complexLiteralId);
-        complexLiteralId.Should().StartWith(expectedPrefix);
+        complexLiteralId.Name.Should().StartWith(expectedPrefix);
     }
 
     public static TheoryData<ComplexLiteral, string> StartsWithData =>