Supporting using const fields in hardware entry types (since they don…

…'t do anything on the hardware)
Lombiq · Sep 21, 2023 · 196ba40 · 196ba40
1 parent 62cf446
commit 196ba40
Show file tree

Hide file tree

Showing 5 changed files with 203 additions and 19 deletions.
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/...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/...st.Transformer.Vhdl.Tests/VerificationTests/StaticTestInputAssembliesVerificationTests.cs b/...st.Transformer.Vhdl.Tests/VerificationTests/StaticTestInputAssembliesVerificationTests.cs
@@ -30,7 +30,11 @@ public Task StaticTestInputAssemblyMatchesApproved() =>
                 new[] { typeof(ArrayUsingCases).Assembly },
                 configuration =>
                 {
-                    configuration.TransformerConfiguration().UseSimpleMemory = false;
+                    var transformerConfiguration = configuration.TransformerConfiguration();
+                    transformerConfiguration.UseSimpleMemory = false;
+                    transformerConfiguration.ArrayLengths.Add(
+                        "System.Int32 Hast.TestInputs.Static.ArrayUsingCases+<>c::<PassArrayToTask>b__1_0(System.Object).arrayObject",
+                        ArrayUsingCases.TaskArrayLength);
 
                     configuration
                         .TransformerConfiguration()