refactor(MemberExpression) - remove computed

Author: Минин Степан Александрович

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

@@ -270,7 +270,7 @@ public AddressedInstructions Visit(AssignmentExpression visitable)
     public AddressedInstructions Visit(MemberExpression visitable) =>
         visitable.Empty()
             ? []
-            : visitable.Tail?.Accept(This) ?? [];
+            : visitable.AccessChain.Last?.Value.Accept(This) ?? [];
 
     public AddressedInstructions Visit(DotAccess visitable)
     {

src/Application/HydraScript.Application.StaticAnalysis/IComputedTypesStorage.cs

@@ -15,7 +15,6 @@ public static IServiceCollection AddStaticAnalysis(this IServiceCollection servi
         services.AddSingleton<IMethodStorage, MethodStorage>();
         services.AddSingleton<ISymbolTableStorage, SymbolTableStorage>();
 
-        services.AddSingleton<IComputedTypesStorage, ComputedTypesStorage>();
         services.AddSingleton<ITypeDeclarationsResolver, TypeDeclarationsResolver>();
 
         services.AddSingleton<IStandardLibraryProvider, StandardLibraryProvider>();

src/Application/HydraScript.Application.StaticAnalysis/Impl/ComputedTypesStorage.cs

@@ -49,7 +49,6 @@ internal class SemanticChecker : VisitorBase<IAbstractSyntaxTreeNode, Type>,
     private readonly IFunctionWithUndefinedReturnStorage _functionStorage;
     private readonly IMethodStorage _methodStorage;
     private readonly ISymbolTableStorage _symbolTables;
-    private readonly IComputedTypesStorage _computedTypes;
     private readonly IAmbiguousInvocationStorage _ambiguousInvocations;
     private readonly IVisitor<TypeValue, Type> _typeBuilder;
 
@@ -58,15 +57,13 @@ public SemanticChecker(
         IFunctionWithUndefinedReturnStorage functionStorage,
         IMethodStorage methodStorage,
         ISymbolTableStorage symbolTables,
-        IComputedTypesStorage computedTypes,
         IAmbiguousInvocationStorage ambiguousInvocations,
         IVisitor<TypeValue, Type> typeBuilder)
     {
         _typesService = typesService;
         _functionStorage = functionStorage;
         _methodStorage = methodStorage;
         _symbolTables = symbolTables;
-        _computedTypes = computedTypes;
         _ambiguousInvocations = ambiguousInvocations;
         _typeBuilder = typeBuilder;
     }
@@ -83,7 +80,6 @@ public Type Visit(ScriptBody visitable)
 
         _methodStorage.Clear();
         _symbolTables.Clear();
-        _computedTypes.Clear();
         _ambiguousInvocations.Clear();
 
         return _typesService.Undefined;
@@ -341,17 +337,18 @@ public Type Visit(AssignmentExpression visitable)
     public Type Visit(MemberExpression visitable)
     {
         IAbstractSyntaxTreeNode id = visitable.Id;
-        var idType = id.Accept(This);
-        visitable.ComputedIdTypeGuid = _computedTypes.Save(idType);
-        return visitable.Empty() ? idType : visitable.AccessChain?.Accept(This) ?? _typesService.Undefined;
+        return visitable.Empty()
+            ? id.Accept(This)
+            : visitable.AccessChain.Last?.Value.Accept(This) ?? _typesService.Undefined;
     }
 
     public Type Visit(IndexAccess visitable)
     {
-        var prevTypeGuid =
-            visitable.Prev?.ComputedTypeGuid
-            ?? (visitable.Parent as MemberExpression)!.ComputedIdTypeGuid;
-        var prevType = _computedTypes.Get(prevTypeGuid);
+        var prevType =
+            visitable.Prev?.Accept(This) ??
+            (visitable.Parent is MemberExpression { Id: IAbstractSyntaxTreeNode id }
+                ? id.Accept(This)
+                : _typesService.Undefined);
 
         if (!prevType.TryGetOperator("[]", out var indexOperator))
             throw new NonAccessibleType(prevType);
@@ -361,16 +358,16 @@ public Type Visit(IndexAccess visitable)
         if (!indexOperator.TryGetResultType(indexAccessDescriptor, out var elemType))
             throw new ArrayAccessException(visitable.Segment, indexType);
 
-        visitable.ComputedTypeGuid = _computedTypes.Save(elemType);
-        return visitable.HasNext() ? visitable.Next?.Accept(This) ?? _typesService.Undefined : elemType;
+        return elemType;
     }
 
     public Type Visit(DotAccess visitable)
     {
-        var prevTypeGuid =
-            visitable.Prev?.ComputedTypeGuid
-            ?? (visitable.Parent as MemberExpression)!.ComputedIdTypeGuid;
-        var prevType = _computedTypes.Get(prevTypeGuid);
+        var prevType =
+            visitable.Prev?.Accept(This) ??
+            (visitable.Parent is MemberExpression { Id: IAbstractSyntaxTreeNode id }
+                ? id.Accept(This)
+                : _typesService.Undefined);
 
         if (prevType is not ObjectType objectType)
             throw new NonAccessibleType(prevType);
@@ -381,8 +378,8 @@ public Type Visit(DotAccess visitable)
             return hasMethod
                 ? objectType
                 : throw new ObjectAccessException(visitable.Segment, objectType, visitable.Property);
-        visitable.ComputedTypeGuid = _computedTypes.Save(fieldType);
-        return visitable.HasNext() ? visitable.Next?.Accept(This) ?? _typesService.Undefined : fieldType;
+
+        return fieldType;
     }
 
     public ObjectType Visit(WithExpression visitable)

src/Application/HydraScript.Application.StaticAnalysis/ServiceCollectionExtensions.cs

@@ -2,12 +2,9 @@ namespace HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Expressions.AccessEx
 
 public abstract class AccessExpression : Expression
 {
-    public AccessExpression? Next { get; private set; }
+    protected AccessExpression? Next { get; private set; }
 
-    public AccessExpression? Prev =>
-        Parent as AccessExpression;
-
-    public Guid ComputedTypeGuid { get; set; } = Guid.Empty;
+    public AccessExpression? Prev => Parent as AccessExpression;
 
     protected AccessExpression(AccessExpression? prev)
     {
@@ -18,12 +15,10 @@ protected AccessExpression(AccessExpression? prev)
         }
     }
 
-    public bool HasNext() =>
-        Next is not null;
-
-    public bool HasPrev() =>
-        Prev is not null;
+    public bool HasPrev() => Prev is not null;
 
     public abstract override TReturn Accept<TReturn>(
         IVisitor<IAbstractSyntaxTreeNode, TReturn> visitor);
+
+    public abstract override AccessExpression Clone();
 }

src/Application/HydraScript.Application.StaticAnalysis/Visitors/SemanticChecker.cs

@@ -6,7 +6,7 @@ namespace HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Expressions.AccessEx
 public partial class DotAccess : AccessExpression
 {
     protected override IReadOnlyList<IAbstractSyntaxTreeNode> Children =>
-        HasNext() ? [Property, Next!] : [Property];
+        Next is { } next ? [Property, next] : [Property];
 
     public IdentifierReference Property { get; }
 
@@ -17,4 +17,6 @@ public DotAccess(IdentifierReference property, AccessExpression? prev = null) :
     }
 
     protected override string NodeRepresentation() => ".";
+
+    public override DotAccess Clone() => new(Property.Clone(), Prev?.Clone());
 }

src/Domain/HydraScript.Domain.FrontEnd/Parser/Impl/Ast/Nodes/Expressions/AccessExpressions/AccessExpression.cs

@@ -4,7 +4,7 @@ namespace HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Expressions.AccessEx
 public partial class IndexAccess : AccessExpression
 {
     protected override IReadOnlyList<IAbstractSyntaxTreeNode> Children =>
-        HasNext() ? [Index, Next!] : [Index];
+        Next is { } next ? [Index, next] : [Index];
 
     public Expression Index { get; }
 
@@ -15,4 +15,6 @@ public IndexAccess(Expression index, AccessExpression? prev = null) : base(prev)
     }
 
     protected override string NodeRepresentation() => "[]";
+
+    public override IndexAccess Clone() => new(Index.Clone(), Prev?.Clone());
 }

src/Domain/HydraScript.Domain.FrontEnd/Parser/Impl/Ast/Nodes/Expressions/AccessExpressions/DotAccess.cs

@@ -9,33 +9,41 @@ public partial class MemberExpression : LeftHandSideExpression
     private readonly IdentifierReference _identifierReference;
 
     protected override IReadOnlyList<IAbstractSyntaxTreeNode> Children =>
-        AccessChain is not null ? [Id, AccessChain] : [Id];
+        AccessChain.First is { Value: { } head } ? [Id, head] : [Id];
 
-    public AccessExpression? AccessChain { get; }
-    public AccessExpression? Tail { get; }
+    public LinkedList<AccessExpression> AccessChain { get; }
 
-    public Guid ComputedIdTypeGuid { get; set; } = Guid.Empty;
-
-    public MemberExpression(IdentifierReference identifierReference)
+    public MemberExpression(IdentifierReference identifierReference) :
+        this(identifierReference, [])
     {
-        _identifierReference = identifierReference;
-        _identifierReference.Parent = this;
     }
 
     public MemberExpression(
         IdentifierReference identifierReference,
-        AccessExpression? accessChain,
-        AccessExpression? tail) : this(identifierReference)
+        LinkedList<AccessExpression> accessChain)
     {
-        AccessChain = accessChain;
-        AccessChain?.Parent = this;
+        _identifierReference = identifierReference;
+        _identifierReference.Parent = this;
 
-        Tail = tail;
+        AccessChain = accessChain;
+        AccessChain.First?.Value.Parent = this;
     }
 
     public override IdentifierReference Id => _identifierReference;
 
     public bool Empty() => AccessChain.Count == 0;
 
     protected override string NodeRepresentation() => nameof(MemberExpression);
+
+    public override MemberExpression Clone()
+    {
+        var clonedAccessChain = new LinkedList<AccessExpression>();
+        var clonedTail = AccessChain.Last?.Value.Clone();
+        while (clonedTail != null)
+        {
+            clonedAccessChain.AddFirst(clonedTail);
+            clonedTail = clonedTail.Prev;
+        }
+        return new MemberExpression(Id.Clone(), clonedAccessChain);
+    }
 }

src/Domain/HydraScript.Domain.FrontEnd/Parser/Impl/Ast/Nodes/Expressions/AccessExpressions/IndexAccess.cs

@@ -83,10 +83,7 @@ private MemberExpression MemberExpression()
             }
         }
 
-        return new MemberExpression(
-            memberRoot,
-            accessChain.First?.Value,
-            tail: accessChain.Last?.Value)
+        return new MemberExpression(memberRoot, accessChain)
         {
             Segment = memberRoot.Segment
         };
@@ -208,8 +205,8 @@ private Expression EqualityExpression()
     private Expression RelationExpression()
     {
         var left = AdditiveExpression();
-        while (CurrentIsOperator(">") || CurrentIsOperator("<") || CurrentIsOperator(">=") ||
-               CurrentIsOperator("<="))
+        while (CurrentIsOperator(">") || CurrentIsOperator("<") ||
+               CurrentIsOperator(">=") || CurrentIsOperator("<="))
         {
             var op = Expect("Operator");
             var right = AdditiveExpression();