#61 - codegen fix

Author: Stepami

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

@@ -262,7 +262,6 @@ public AddressedInstructions Visit(CallExpression visitable)
             return [];
 
         var methodCall = !visitable.Empty();
-        string functionId;
         AddressedInstructions result = [];
 
         if (methodCall)
@@ -271,12 +270,6 @@ public AddressedInstructions Visit(CallExpression visitable)
             var lastMemberInstruction = (DotRead)memberInstructions[memberInstructions.End];
             memberInstructions.Remove(lastMemberInstruction);
             result.AddRange(memberInstructions);
-
-            functionId = lastMemberInstruction.Property;
-        }
-        else
-        {
-            functionId = visitable.Id;
         }
 
         if (methodCall)
@@ -298,7 +291,7 @@ public AddressedInstructions Visit(CallExpression visitable)
         }
 
         result.Add(new CallFunction(
-            new FunctionInfo(functionId),
+            new FunctionInfo(visitable.ComputedFunctionAddress),
             visitable.HasReturnValue));
 
         return result;

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

@@ -118,7 +118,7 @@ public AddressedInstructions Visit(FunctionDeclaration visitable)
         if (!visitable.Statements.Any())
             return [];
 
-        var functionInfo = new FunctionInfo(visitable.Name);
+        var functionInfo = new FunctionInfo(visitable.ComputedFunctionAddress);
 
         var result = new AddressedInstructions
         {

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

@@ -71,8 +71,9 @@ public VisitUnit Visit(FunctionDeclaration visitable)
             new VariableSymbol(
                 name: x.Key,
                 x.TypeValue.Accept(_typeBuilder))).ToList();
-        if (_symbolTables[visitable.Parent.Scope].ContainsSymbol(
-                new FunctionSymbolId(visitable.Name, parameters.Select(x => x.Type))))
+        var functionSymbolId = new FunctionSymbolId(visitable.Name, parameters.Select(x => x.Type));
+        visitable.ComputedFunctionAddress = functionSymbolId.ToString();
+        if (_symbolTables[visitable.Parent.Scope].ContainsSymbol(functionSymbolId))
             throw new DeclarationAlreadyExists(visitable.Name);
 
         for (var i = 0; i < parameters.Count; i++)

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

@@ -420,6 +420,7 @@ public Type Visit(CallExpression visitable)
                 ?? throw new UnknownIdentifierReference(visitable.Id);
         }
 
+        visitable.ComputedFunctionAddress = functionSymbol.Id.ToString();
         visitable.IsEmptyCall = functionSymbol.IsEmpty;
         var functionReturnType = functionSymbol.Type;
 

src/Domain/HydraScript.Domain.FrontEnd/Parser/Impl/Ast/Nodes/Declarations/AfterTypesAreLoaded/FunctionDeclaration.cs

@@ -17,6 +17,8 @@ public partial class FunctionDeclaration : AfterTypesAreLoadedDeclaration
     public BlockStatement Statements { get; }
     public bool IsEmpty => Statements.Count == 0;
 
+    public string ComputedFunctionAddress { get; set; } = default!;
+
     public FunctionDeclaration(
         IdentifierReference name,
         TypeValue returnTypeValue,

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

@@ -16,6 +16,8 @@ public partial class CallExpression : LeftHandSideExpression
     public bool IsEmptyCall { get; set; }
     public bool HasReturnValue { get; set; }
 
+    public string ComputedFunctionAddress { get; set; } = default!;
+
     public CallExpression(MemberExpression member, IEnumerable<Expression> expressions)
     {
         Member = member;