#153 - generic FindSymbol

Author: Stepami

src/Application/HydraScript.Application.StaticAnalysis/IMethodStorage.cs

@@ -1,5 +1,5 @@
-using HydraScript.Domain.IR.Impl.SymbolIds;
 using HydraScript.Domain.IR.Impl.Symbols;
+using HydraScript.Domain.IR.Impl.Symbols.Ids;
 using HydraScript.Domain.IR.Types;
 
 namespace HydraScript.Application.StaticAnalysis;

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

@@ -1,6 +1,6 @@
 using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Declarations.AfterTypesAreLoaded;
-using HydraScript.Domain.IR.Impl.SymbolIds;
 using HydraScript.Domain.IR.Impl.Symbols;
+using HydraScript.Domain.IR.Impl.Symbols.Ids;
 
 namespace HydraScript.Application.StaticAnalysis.Impl;
 

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

@@ -1,5 +1,5 @@
-using HydraScript.Domain.IR.Impl.SymbolIds;
 using HydraScript.Domain.IR.Impl.Symbols;
+using HydraScript.Domain.IR.Impl.Symbols.Ids;
 using HydraScript.Domain.IR.Types;
 
 namespace HydraScript.Application.StaticAnalysis.Impl;

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

@@ -1,6 +1,6 @@
 using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Declarations;
-using HydraScript.Domain.IR.Impl.SymbolIds;
 using HydraScript.Domain.IR.Impl.Symbols;
+using HydraScript.Domain.IR.Impl.Symbols.Ids;
 
 namespace HydraScript.Application.StaticAnalysis.Impl;
 
@@ -33,7 +33,7 @@ public void Resolve()
             var declarationToResolve = _declarationsToResolve.Dequeue();
 
             var typeSymbol = symbolTables[declarationToResolve.Scope]
-                .FindSymbol<TypeSymbol>(new TypeSymbolId(declarationToResolve.TypeId))!;
+                .FindSymbol(new TypeSymbolId(declarationToResolve.TypeId))!;
 
             var resolvingCandidates = symbolTables[declarationToResolve.Scope]
                 .GetAvailableSymbols()

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

@@ -4,8 +4,8 @@
 using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Declarations.AfterTypesAreLoaded;
 using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Expressions.ComplexLiterals;
 using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Expressions.PrimaryExpressions;
-using HydraScript.Domain.IR.Impl.SymbolIds;
 using HydraScript.Domain.IR.Impl.Symbols;
+using HydraScript.Domain.IR.Impl.Symbols.Ids;
 using HydraScript.Domain.IR.Types;
 
 namespace HydraScript.Application.StaticAnalysis.Visitors;

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

@@ -9,8 +9,8 @@
 using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Expressions.ComplexLiterals;
 using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Expressions.PrimaryExpressions;
 using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Statements;
-using HydraScript.Domain.IR.Impl.SymbolIds;
 using HydraScript.Domain.IR.Impl.Symbols;
+using HydraScript.Domain.IR.Impl.Symbols.Ids;
 using HydraScript.Domain.IR.Types;
 
 namespace HydraScript.Application.StaticAnalysis.Visitors;
@@ -138,7 +138,7 @@ public Type Visit(ExpressionStatement visitable) =>
 
     public Type Visit(IdentifierReference visitable)
     {
-        var symbol = _symbolTables[visitable.Scope].FindSymbol<VariableSymbol>(new VariableSymbolId(visitable.Name));
+        var symbol = _symbolTables[visitable.Scope].FindSymbol(new VariableSymbolId(visitable.Name));
         if (symbol is { Initialized: false })
             throw new AccessBeforeInitialization(visitable);
         return symbol?.Type ?? throw new UnknownIdentifierReference(visitable);
@@ -277,9 +277,9 @@ public Type Visit(LexicalDeclaration visitable)
         for (var i = 0; i < visitable.Assignments.Count; i++)
         {
             var assignment = visitable.Assignments[i];
-            var registeredSymbol = _symbolTables[visitable.Scope].FindSymbol<VariableSymbol>(
-                new VariableSymbolId(assignment.Destination.Id))!;
+            var registeredSymbol = _symbolTables[visitable.Scope].FindSymbol(new VariableSymbolId(assignment.Destination.Id))!;
             var sourceType = assignment.Source.Accept(This);
+
             if (sourceType.Equals(undefined))
                 throw new CannotDefineType(assignment.Source.Segment);
             if (sourceType.Equals(@void))
@@ -325,8 +325,7 @@ public Type Visit(AssignmentExpression visitable)
         }
 
         var symbol =
-            _symbolTables[visitable.Scope].FindSymbol<VariableSymbol>(
-                new VariableSymbolId(visitable.Destination.Id)) ??
+            _symbolTables[visitable.Scope].FindSymbol(new VariableSymbolId(visitable.Destination.Id)) ??
             throw new UnknownIdentifierReference(visitable.Destination.Id);
 
         if (symbol.ReadOnly)
@@ -416,7 +415,7 @@ public Type Visit(CallExpression visitable)
         else
         {
             functionSymbol =
-                _symbolTables[visitable.Scope].FindSymbol<FunctionSymbol>(new FunctionSymbolId(visitable.Id, parameters))
+                _symbolTables[visitable.Scope].FindSymbol(new FunctionSymbolId(visitable.Id, parameters))
                 ?? throw new UnknownIdentifierReference(visitable.Id);
         }
 
@@ -454,7 +453,7 @@ public Type Visit(CallExpression visitable)
     public Type Visit(FunctionDeclaration visitable)
     {
         var parameters = visitable.Arguments.Select(x => x.TypeValue.Accept(_typeBuilder)).ToList();
-        var symbol = _symbolTables[visitable.Scope].FindSymbol<FunctionSymbol>(new FunctionSymbolId(visitable.Name, parameters))!;
+        var symbol = _symbolTables[visitable.Scope].FindSymbol(new FunctionSymbolId(visitable.Name, parameters))!;
         _functionStorage.RemoveIfPresent(symbol);
         visitable.Statements.Accept(This);
 

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

@@ -1,7 +1,6 @@
 using HydraScript.Application.StaticAnalysis.Exceptions;
 using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Declarations;
-using HydraScript.Domain.IR.Impl.SymbolIds;
-using HydraScript.Domain.IR.Impl.Symbols;
+using HydraScript.Domain.IR.Impl.Symbols.Ids;
 using HydraScript.Domain.IR.Types;
 
 namespace HydraScript.Application.StaticAnalysis.Visitors;
@@ -18,7 +17,7 @@ public TypeBuilder(ISymbolTableStorage symbolTables) =>
         _symbolTables = symbolTables;
 
     public Type Visit(TypeIdentValue visitable) =>
-        _symbolTables[visitable.Scope].FindSymbol<TypeSymbol>(new TypeSymbolId(visitable.TypeId))?.Type ??
+        _symbolTables[visitable.Scope].FindSymbol(new TypeSymbolId(visitable.TypeId))?.Type ??
         throw new UnknownIdentifierReference(visitable.TypeId);
 
     public ArrayType Visit(ArrayTypeValue visitable)

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

@@ -2,8 +2,8 @@
 using HydraScript.Domain.FrontEnd.Parser;
 using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes;
 using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Declarations;
-using HydraScript.Domain.IR.Impl.SymbolIds;
 using HydraScript.Domain.IR.Impl.Symbols;
+using HydraScript.Domain.IR.Impl.Symbols.Ids;
 
 namespace HydraScript.Application.StaticAnalysis.Visitors;
 

src/Domain/HydraScript.Domain.IR/Types/ObjectType.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.Types;
 

tests/HydraScript.UnitTests/Application/SymbolTableTests.cs

@@ -15,7 +15,7 @@ public void FindSymbolTest(ISymbol symbol)
         outerScope.AddSymbol(symbol);
         innerScope.AddOpenScope(outerScope);
 
-        Assert.NotNull(innerScope.FindSymbol<ISymbol>(id));
+        Assert.NotNull(innerScope.FindSymbol(id));
         Assert.True(outerScope.ContainsSymbol(id));
     }
 }