Merge pull request #111 from Lombiq/issue/HAST-321

HAST-321: Fix that array size passing is too eager with assignments
Lombiq · Sep 22, 2023 · 49ab6d2 · 49ab6d2
2 parents aed9b6f + e97463d
commit 49ab6d2
Show file tree

Hide file tree

Showing 11 changed files with 246 additions and 36 deletions.
diff --git a/NuGetTest/Hast.NuGet.Console/Hast.NuGet.Console.csproj b/NuGetTest/Hast.NuGet.Console/Hast.NuGet.Console.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Hast.Algorithms" Version="2.1.0" />
-    <PackageReference Include="Hast.Layer" Version="2.1.0" />
+    <PackageReference Include="Hast.Algorithms" Version="2.1.1-alpha.0.hast-321" />
+    <PackageReference Include="Hast.Layer" Version="2.1.1-alpha.0.hast-321" />
     <PackageReference Include="Hast.Vitis.HardwareFramework" Version="1.2.0" />
   </ItemGroup>
 

diff --git a/src/Hastlayer/Hast.Transformer.Vhdl/Verifiers/HardwareEntryPointsVerifier.cs b/src/Hastlayer/Hast.Transformer.Vhdl/Verifiers/HardwareEntryPointsVerifier.cs
@@ -36,7 +36,9 @@ private void VerifyHardwareEntryPoints(SyntaxTree syntaxTree, ITypeDeclarationLo
         {
             var unsupportedMembers = type
                 .Members
-                .Where(member => member is FieldDeclaration || member is PropertyDeclaration || member.GetFullName().IsConstructorName());
+                .Where(member =>
+                    (member is FieldDeclaration or PropertyDeclaration && !member.HasModifier(Modifiers.Const)) ||
+                    member.GetFullName().IsConstructorName());
             if (unsupportedMembers.Any())
             {
                 throw new NotSupportedException(

diff --git a/src/Hastlayer/Hast.Transformer/Models/IArraySizeHolder.cs b/src/Hastlayer/Hast.Transformer/Models/IArraySizeHolder.cs
@@ -49,10 +49,10 @@ public static IArraySize GetSizeOrThrow(this IArraySizeHolder arraySizeHolder, A
         if (size == null)
         {
             throw new NotSupportedException(
-                "The length of the array holder " + arrayHolder.GetFullName() +
-                " couldn't be statically determined. Only arrays with dimensions defined at compile-time are " +
-                "supported. If the array size is actually static just Hastlayer can't figure it out for some " +
-                "reason then you can configure it manually via TransformerConfiguration.");
+                "The length of the array holder \"" + arrayHolder.GetFullName() + "\" couldn't be statically " +
+                "determined. Only arrays with dimensions defined at compile-time are supported. If the array size is " +
+                "actually static just Hastlayer can't figure it out for some reason then you can configure it " +
+                "manually via TransformerConfiguration by using the quoted full name.");
         }
 
         return size;

diff --git a/...ayer/Hast.Transformer/Services/ConstantValuesSubstitution/ConstantValuesMarkingVisitor.cs b/...ayer/Hast.Transformer/Services/ConstantValuesSubstitution/ConstantValuesMarkingVisitor.cs
@@ -215,6 +215,16 @@ private void PassLengthOfArrayHolderToParent(AstNode arrayHolder, int arrayLengt
             {
                 AssignmentHandler = assignmentExpression =>
                 {
+                    // Only assignments where an array is assigned to another member/variable matters, not just any
+                    // assignment where arrayHolder is on the right (excluding cases where e.g. the right side is a
+                    // method call with an array as an argument).
+                    if (assignmentExpression.Right != arrayHolder &&
+                        assignmentExpression.Right is InvocationExpression invocationExpression &&
+                            invocationExpression.Target != arrayHolder)
+                    {
+                        return;
+                    }
+
                     if (assignmentExpression.Left is MemberReferenceExpression memberReferenceExpression)
                     {
                         _arraySizeHolder.SetSize(

diff --git a/...Hast.Transformer/Services/ConstantValuesSubstitution/ConstantValuesSubstitutingVisitor.cs b/...Hast.Transformer/Services/ConstantValuesSubstitution/ConstantValuesSubstitutingVisitor.cs
@@ -256,9 +256,10 @@ protected override void VisitChildren(AstNode node)
             }
         }
 
-        // Is this a const? Then we can just substitute it directly.
+        // Is this a const expression? Then we can just substitute it directly.
         var resolveResult = node.GetResolveResult();
-        if (resolveResult?.IsCompileTimeConstant == true &&
+        if (node is Expression &&
+            resolveResult?.IsCompileTimeConstant == true &&
             resolveResult.ConstantValue != null &&
             node is not PrimitiveExpression)
         {

diff --git a/src/Samples/Hast.Samples.SampleAssembly/Hast.Samples.SampleAssembly.csproj b/src/Samples/Hast.Samples.SampleAssembly/Hast.Samples.SampleAssembly.csproj
@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="$(SolutionName) == 'Hastlayer.SDK.NuGet'">
-    <PackageReference Include="Hast.Algorithms" Version="2.1.0" />
-    <PackageReference Include="Hast.Layer" Version="2.1.0" />
+    <PackageReference Include="Hast.Algorithms" Version="2.1.1-alpha.0.hast-321" />
+    <PackageReference Include="Hast.Layer" Version="2.1.1-alpha.0.hast-321" />
     <PackageReference Include="Lombiq.Arithmetics" Version="0.0.1-alpha.3.hast-175" />
   </ItemGroup>
 

diff --git a/...st.Transformer.Vhdl.Tests/VerificationTests/StaticTestInputAssembliesVerificationTests.cs b/...st.Transformer.Vhdl.Tests/VerificationTests/StaticTestInputAssembliesVerificationTests.cs
@@ -30,7 +30,12 @@ public Task StaticTestInputAssemblyMatchesApproved() =>
                 new[] { typeof(ArrayUsingCases).Assembly },
                 configuration =>
                 {
-                    configuration.TransformerConfiguration().UseSimpleMemory = false;
+                    var transformerConfiguration = configuration.TransformerConfiguration();
+                    transformerConfiguration.UseSimpleMemory = false;
+                    // This shouldn't be necessary: https://github.com/Lombiq/Hastlayer-SDK/issues/112.
+                    transformerConfiguration.ArrayLengths.Add(
+                        "System.Int32 Hast.TestInputs.Static.ArrayUsingCases+<>c::<PassArrayToTask>b__1_0(System.Object).arrayObject",
+                        ArrayUsingCases.TaskArrayLength);
 
                     configuration
                         .TransformerConfiguration()