#153 - symbols refactoring

Author: Stepami

src/Domain/HydraScript.Domain.IR/ISymbol.cs

@@ -2,7 +2,7 @@ namespace HydraScript.Domain.IR;
 
 public interface ISymbol
 {
-    public SymbolId Id { get; }
+    public ISymbolId<ISymbol> Id { get; }
     public string Name { get; }
     public Type Type { get; }
 }

src/Domain/HydraScript.Domain.IR/Impl/SymbolIds/TypeSymbolId.cs

@@ -1,5 +1,5 @@
 using System.Text;
-using HydraScript.Domain.IR.Impl.SymbolIds;
+using HydraScript.Domain.IR.Impl.Symbols.Ids;
 
 namespace HydraScript.Domain.IR.Impl.Symbols;
 

src/Domain/HydraScript.Domain.IR/Impl/SymbolIds/VariableSymbolId.cs

@@ -1,8 +1,8 @@
-namespace HydraScript.Domain.IR.Impl.SymbolIds;
+namespace HydraScript.Domain.IR.Impl.Symbols.Ids;
 
 public class FunctionSymbolId(
     string name,
-    IEnumerable<Type> parameters) : SymbolId
+    IEnumerable<Type> parameters) : SymbolId<FunctionSymbol>
 {
     protected override string Value { get; } =
         $"function {name}({string.Join(", ", parameters)})";

src/Domain/HydraScript.Domain.IR/Impl/Symbols/FunctionSymbol.cs

@@ -1,4 +1,4 @@
-namespace HydraScript.Domain.IR;
+namespace HydraScript.Domain.IR.Impl.Symbols.Ids;
 
 public abstract class SymbolId<TSymbol> : ISymbolId<TSymbol>
     where TSymbol : class, ISymbol

…in.IR/Impl/SymbolIds/FunctionSymbolId.cs ….IR/Impl/Symbols/Ids/FunctionSymbolId.cssrc/Domain/HydraScript.Domain.IR/Impl/SymbolIds/FunctionSymbolId.cs renamed to src/Domain/HydraScript.Domain.IR/Impl/Symbols/Ids/FunctionSymbolId.cs src/Domain/HydraScript.Domain.IR/Impl/SymbolIds/FunctionSymbolId.cs renamed to src/Domain/HydraScript.Domain.IR/Impl/Symbols/Ids/FunctionSymbolId.cs

@@ -0,0 +1,6 @@
+namespace HydraScript.Domain.IR.Impl.Symbols.Ids;
+
+public class TypeSymbolId(string name) : SymbolId<TypeSymbol>
+{
+    protected override string Value { get; } = "type " + name;
+}

…Domain/HydraScript.Domain.IR/SymbolId.cs …t.Domain.IR/Impl/Symbols/Ids/SymbolId.cssrc/Domain/HydraScript.Domain.IR/SymbolId.cs renamed to src/Domain/HydraScript.Domain.IR/Impl/Symbols/Ids/SymbolId.cs src/Domain/HydraScript.Domain.IR/SymbolId.cs renamed to src/Domain/HydraScript.Domain.IR/Impl/Symbols/Ids/SymbolId.cs

@@ -0,0 +1,6 @@
+namespace HydraScript.Domain.IR.Impl.Symbols.Ids;
+
+public class VariableSymbolId(string name) : SymbolId<VariableSymbol>
+{
+    protected override string Value { get; } = "var " + name;
+}

src/Domain/HydraScript.Domain.IR/Impl/Symbols/Ids/TypeSymbolId.cs

@@ -2,7 +2,7 @@ namespace HydraScript.Domain.IR.Impl.Symbols;
 
 public abstract class Symbol(string name, Type type) : ISymbol
 {
-    public abstract SymbolId Id { get; }
+    public abstract ISymbolId<ISymbol> Id { get; }
     public string Name { get; } = name;
     public virtual Type Type { get; } = type;
 }

src/Domain/HydraScript.Domain.IR/Impl/Symbols/Ids/VariableSymbolId.cs

@@ -1,11 +1,11 @@
-using HydraScript.Domain.IR.Impl.SymbolIds;
+using HydraScript.Domain.IR.Impl.Symbols.Ids;
 
 namespace HydraScript.Domain.IR.Impl.Symbols;
 
 public class TypeSymbol(Type type, string? name = null) :
     Symbol(name ?? type.ToString(), type)
 {
-    public override SymbolId Id { get; } = new TypeSymbolId(name ?? type.ToString());
+    public override TypeSymbolId Id { get; } = new(name ?? type.ToString());
 
     public override bool Equals(object? obj) =>
         obj is TypeSymbol typeSymbol &&