#167 - доработка кодогенерации

Author: Stepami

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

@@ -129,8 +129,14 @@ public AddressedInstructions Visit(FunctionDeclaration visitable)
             }
         };
 
-        foreach (var arg in visitable.Arguments)
-            result.Add(new PopParameter(arg.Name));
+        for (var i = 0; i < visitable.Arguments.Count; i++)
+        {
+            var arg = visitable.Arguments[i];
+            if (arg is DefaultValueArgument @default)
+                result.Add(new PopParameter(arg.Name, @default.Info.Value));
+            else
+                result.Add(new PopParameter(arg.Name));
+        }
 
         result.AddRange(visitable.Statements.Accept(This));
         if (!visitable.HasReturnStatement())

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

@@ -69,12 +69,12 @@ public VisitUnit Visit(FunctionDeclaration visitable)
     {
         var indexOfFirstDefaultArgument = visitable.Arguments
             .Select((x, i) => new { Argument = x, Index = i })
-            .FirstOrDefault(pair => pair.Argument.Default)?.Index ?? -1;
+            .FirstOrDefault(pair => pair.Argument is DefaultValueArgument)?.Index ?? -1;
         if (indexOfFirstDefaultArgument is not -1)
         {
             for (var i = indexOfFirstDefaultArgument; i < visitable.Arguments.Count; i++)
             {
-                if (!visitable.Arguments[i].Default)
+                if (visitable.Arguments[i] is not DefaultValueArgument)
                     throw new NamedArgumentAfterDefaultValueArgument(
                         visitable.Segment,
                         function: visitable.Name,

src/Domain/HydraScript.Domain.BackEnd/Impl/Instructions/PopParameter.cs

@@ -1,14 +1,19 @@
 namespace HydraScript.Domain.BackEnd.Impl.Instructions;
 
-public class PopParameter(string parameter) : Instruction
+public class PopParameter(string parameter, object? defaultValue = null) : Instruction
 {
     public override IAddress Execute(IExecuteParams executeParams)
     {
-        var argument = executeParams.Arguments.Dequeue();
-        executeParams.Frames.Peek()[parameter] = argument;
+        var frame = executeParams.Frames.Peek();
+        if (executeParams.Arguments.TryDequeue(out var argument))
+            frame[parameter] = argument;
+        else
+            frame[parameter] = defaultValue;
         return Address.Next;
     }
 
     protected override string ToStringInternal() =>
-        $"PopParameter {parameter}";
+        defaultValue is null
+        ? $"PopParameter {parameter}"
+        : $"PopParameter {parameter} {defaultValue}";
 }

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

@@ -7,8 +7,6 @@ public interface IFunctionArgument
     public string Name { get; }
 
     public TypeValue TypeValue { get; }
-
-    public bool Default => false;
 }
 
 public record NamedArgument(
@@ -19,14 +17,21 @@ public override string ToString() =>
         $"{Name}: {TypeValue}";
 }
 
-public record DefaultValueArgument(
-    string Name,
-    Literal Value) : IFunctionArgument
+public record DefaultValueArgument : IFunctionArgument
 {
-    public TypeValue TypeValue { get; } = Value.Type;
+    public DefaultValueArgument(string name, Literal literal)
+    {
+        Name = name;
+        TypeValue = literal.Type;
+        Info = literal.ToValueDto();
+    }
+
+    public string Name { get; }
+
+    public TypeValue TypeValue { get; }
 
-    public bool Default => true;
+    public ValueDto Info { get; }
 
     public override string ToString() =>
-        $"{Name} = {Value}";
+        $"{Name} = {Info.Label}";
 }