#61 - использование ключа символа в домене

Author: Stepami

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

@@ -2,6 +2,6 @@ namespace HydraScript.Domain.IR;
 
 public interface ISymbol
 {
-    public string Id { get; }
+    public ISymbolId Id { get; }
     public Type Type { get; }
 }

src/Domain/HydraScript.Domain.IR/ISymbolTable.cs

@@ -23,12 +23,12 @@ public interface ISymbolTable
     /// Поиск эффективного символа
     /// </summary>
     /// <param name="id">Идентификатор символа</param>
-    public TSymbol? FindSymbol<TSymbol>(string id)
+    public TSymbol? FindSymbol<TSymbol>(ISymbolId id)
         where TSymbol : class, ISymbol;
 
     /// <summary>
     /// Проверка наличия собственного символа
     /// </summary>
     /// <param name="id">Идентификатор символа</param>
-    public bool ContainsSymbol(string id);
+    public bool ContainsSymbol(ISymbolId id);
 }

src/Domain/HydraScript.Domain.IR/Impl/SymbolTable.cs

@@ -14,19 +14,19 @@ public IEnumerable<ISymbol> GetAvailableSymbols() =>
 
     /// <inheritdoc cref="ISymbolTable.AddSymbol"/>
     public void AddSymbol(ISymbol symbol) =>
-        _symbols[symbol.Id] = symbol;
+        _symbols[symbol.Id.Value] = symbol;
 
     /// <inheritdoc cref="ISymbolTable.FindSymbol{TSymbol}"/>
-    public TSymbol? FindSymbol<TSymbol>(string id)
+    public TSymbol? FindSymbol<TSymbol>(ISymbolId id)
         where TSymbol : class, ISymbol
     {
-        var hasInsideTheScope = _symbols.TryGetValue(id, out var symbol);
+        var hasInsideTheScope = _symbols.TryGetValue(id.Value, out var symbol);
         return !hasInsideTheScope
             ? _openScope?.FindSymbol<TSymbol>(id)
             : symbol as TSymbol;
     }
 
     /// <inheritdoc cref="ISymbolTable.ContainsSymbol"/>
-    public bool ContainsSymbol(string id) =>
-        _symbols.ContainsKey(id);
+    public bool ContainsSymbol(ISymbolId id) =>
+        _symbols.ContainsKey(id.Value);
 }

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

@@ -1,17 +1,23 @@
 using System.Text;
+using HydraScript.Domain.IR.Impl.SymbolIds;
 
 namespace HydraScript.Domain.IR.Impl.Symbols;
 
 public class FunctionSymbol(
     string id,
-    IEnumerable<ISymbol> parameters,
+    IReadOnlyCollection<ISymbol> parameters,
     Type type,
     bool isEmpty) : Symbol(id, type)
 {
     private Type _returnType = type;
     /// <summary>Тип возврата функции</summary>
     public override Type Type => _returnType;
 
+    /// <summary>
+    /// Перегрузка функции
+    /// </summary>
+    public override ISymbolId Id { get; } = new FunctionSymbolId(id, parameters.Select(x => x.Type));
+
     public IReadOnlyList<ISymbol> Parameters { get; } = new List<ISymbol>(parameters);
     public bool IsEmpty { get; } = isEmpty;
 

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

@@ -1,7 +1,9 @@
+using HydraScript.Domain.IR.Impl.SymbolIds;
+
 namespace HydraScript.Domain.IR.Impl.Symbols;
 
 public abstract class Symbol(string id, Type type) : ISymbol
 {
-    public virtual string Id { get; } = id;
+    public virtual ISymbolId Id { get; } = new NamedSymbolId(id);
     public virtual Type Type { get; } = type;
 }

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

@@ -1,7 +1,7 @@
 namespace HydraScript.Domain.IR.Impl.Symbols;
 
 public class TypeSymbol(Type type, string? id = null) :
-    Symbol(id ?? type.ToString(), type)
+    Symbol("type " + (id ?? type.ToString()), type)
 {
     public override bool Equals(object? obj) =>
         obj is TypeSymbol typeSymbol &&

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

@@ -3,7 +3,7 @@ namespace HydraScript.Domain.IR.Impl.Symbols;
 public class VariableSymbol(
     string id,
     Type type,
-    bool readOnly = false) : Symbol(id, type)
+    bool readOnly = false) : Symbol("var " + id, type)
 {
     public bool ReadOnly { get; } = readOnly;
     public bool Initialized { get; private set; } = readOnly;