Create separate PatioDataLayouts util class

1 files changed, 7 insertions, 6 deletions

diff --git a/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java b/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java
index cfb9bd56..e8f8fdd5 100644
--- a/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java
+++ b/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java
@@ -4,6 +4,7 @@ import org.junit.jupiter.api.Test;
 import org.shedlang.compiler.patio.ast.PatioFunctionDeclaration;
 import org.shedlang.compiler.patio.ast.PatioFunctionDefinition;
 import org.shedlang.compiler.patio.ast.PatioVisibility;
+import org.shedlang.compiler.patio.ast.types.PatioDataLayouts;
 import org.shedlang.compiler.patio.ast.types.PatioTypes;
 import org.shedlang.compiler.patio.instructions.Patio;
 
@@ -46,7 +47,7 @@ public class PatioSerializerTests {
 
     @Test
     public void canSerializeDataElement() {
-        var element = Patio.dataElement("x", PatioTypes.scalar(PatioTypes.INT));
+        var element = Patio.dataElement("x", PatioDataLayouts.scalar(PatioTypes.INT));
 
         var string = PatioTesting.serializeCompilationUnitElement(element);
 
@@ -112,7 +113,7 @@ public class PatioSerializerTests {
     public void canSerializeAlloc() {
         var instruction = Patio.alloc(
             "x",
-            PatioTypes.structFlat(List.of(PatioTypes.INT, PatioTypes.INT, PatioTypes.DATA_POINTER))
+            PatioDataLayouts.structFlat(List.of(PatioTypes.INT, PatioTypes.INT, PatioTypes.DATA_POINTER))
         );
 
         var string = PatioTesting.serializeInstruction(instruction);
@@ -237,7 +238,7 @@ public class PatioSerializerTests {
         var instruction = Patio.memoryLoad(
             "target",
             "pointer",
-            PatioTypes.structFlat(List.of(PatioTypes.INT, PatioTypes.INT, PatioTypes.DATA_POINTER)),
+            PatioDataLayouts.structFlat(List.of(PatioTypes.INT, PatioTypes.INT, PatioTypes.DATA_POINTER)),
             List.of(1)
         );
 
@@ -258,7 +259,7 @@ public class PatioSerializerTests {
     public void canSerializeMemoryStore() {
         var instruction = Patio.memoryStore(
             "pointer",
-            PatioTypes.structFlat(List.of(PatioTypes.INT, PatioTypes.INT, PatioTypes.DATA_POINTER)),
+            PatioDataLayouts.structFlat(List.of(PatioTypes.INT, PatioTypes.INT, PatioTypes.DATA_POINTER)),
             List.of(1),
             "value"
         );
@@ -383,7 +384,7 @@ public class PatioSerializerTests {
 
     @Test
     public void canSerializeScalar() {
-        var layout = PatioTypes.scalar(PatioTypes.INT);
+        var layout = PatioDataLayouts.scalar(PatioTypes.INT);
 
         var string = PatioTesting.serializeDataLayout(layout);
 
@@ -392,7 +393,7 @@ public class PatioSerializerTests {
 
     @Test
     public void canSerializeStruct() {
-        var layout = PatioTypes.structFlat(List.of(PatioTypes.INT, PatioTypes.INT, PatioTypes.DATA_POINTER));
+        var layout = PatioDataLayouts.structFlat(List.of(PatioTypes.INT, PatioTypes.INT, PatioTypes.DATA_POINTER));
 
         var string = PatioTesting.serializeDataLayout(layout);