Tidy up structure of Patio AST

7 files changed, 15 insertions, 12 deletions

diff --git a/src/test/java/org/shedlang/compiler/patio/PatioCodeGenCallTests.java b/src/test/java/org/shedlang/compiler/patio/PatioCodeGenCallTests.java
index 78c1e937..39c47867 100644
--- a/src/test/java/org/shedlang/compiler/patio/PatioCodeGenCallTests.java
+++ b/src/test/java/org/shedlang/compiler/patio/PatioCodeGenCallTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.patio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.instructions.PatioLocal;
+import org.shedlang.compiler.patio.ast.PatioLocal;
 import org.shedlang.compiler.stackir.instructions.Instructions;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/patio/PatioCodeGenDiscardTests.java b/src/test/java/org/shedlang/compiler/patio/PatioCodeGenDiscardTests.java
index 2f1c85a0..6bf90f56 100644
--- a/src/test/java/org/shedlang/compiler/patio/PatioCodeGenDiscardTests.java
+++ b/src/test/java/org/shedlang/compiler/patio/PatioCodeGenDiscardTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.patio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.instructions.PatioLocal;
+import org.shedlang.compiler.patio.ast.PatioLocal;
 import org.shedlang.compiler.stackir.instructions.Instructions;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/patio/PatioCodeGenLocalStoreTests.java b/src/test/java/org/shedlang/compiler/patio/PatioCodeGenLocalStoreTests.java
index 4003ee6d..af127819 100644
--- a/src/test/java/org/shedlang/compiler/patio/PatioCodeGenLocalStoreTests.java
+++ b/src/test/java/org/shedlang/compiler/patio/PatioCodeGenLocalStoreTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.patio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.instructions.PatioLocal;
+import org.shedlang.compiler.patio.ast.PatioLocal;
 import org.shedlang.compiler.stackir.instructions.Instructions;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/patio/PatioCodeGenReturnTests.java b/src/test/java/org/shedlang/compiler/patio/PatioCodeGenReturnTests.java
index fe06f556..44d24e5a 100644
--- a/src/test/java/org/shedlang/compiler/patio/PatioCodeGenReturnTests.java
+++ b/src/test/java/org/shedlang/compiler/patio/PatioCodeGenReturnTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.patio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.instructions.PatioLocal;
+import org.shedlang.compiler.patio.ast.PatioLocal;
 import org.shedlang.compiler.stackir.instructions.Instructions;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/patio/PatioInstructionSerializerTests.java b/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java
index 00097d35..5a97bd48 100644
--- a/src/test/java/org/shedlang/compiler/patio/PatioInstructionSerializerTests.java
+++ b/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java
@@ -2,14 +2,14 @@ package org.shedlang.compiler.patio;
 
 import org.junit.jupiter.api.Test;
 import org.shedlang.compiler.patio.instructions.Patio;
-import org.shedlang.compiler.patio.instructions.PatioFunctionDefinition;
+import org.shedlang.compiler.patio.ast.PatioFunctionDefinition;
 
 import java.util.List;
 
 import static org.zwobble.precisely.AssertThat.assertThat;
 import static org.zwobble.precisely.Matchers.equalTo;
 
-public class PatioInstructionSerializerTests {
+public class PatioSerializerTests {
     @Test
     public void canSerializeFunctionDefinition() {
         var element = PatioFunctionDefinition.builder()
diff --git a/src/test/java/org/shedlang/compiler/patio/PatioTesting.java b/src/test/java/org/shedlang/compiler/patio/PatioTesting.java
index e571d49a..47fb37b7 100644
--- a/src/test/java/org/shedlang/compiler/patio/PatioTesting.java
+++ b/src/test/java/org/shedlang/compiler/patio/PatioTesting.java
@@ -1,7 +1,8 @@
 package org.shedlang.compiler.patio;
 
-import org.shedlang.compiler.patio.instructions.PatioCompilationUnitElement;
-import org.shedlang.compiler.patio.instructions.PatioInstruction;
+import org.shedlang.compiler.patio.ast.PatioCompilationUnitElement;
+import org.shedlang.compiler.patio.ast.PatioSerializer;
+import org.shedlang.compiler.patio.ast.instructions.PatioInstruction;
 
 class PatioTesting {
     private PatioTesting() {}
@@ -11,13 +12,13 @@ class PatioTesting {
 
         builder.append("Compilation unit elements:\n\n");
         for (var element : context.compilationUnitContext().elementsByName().values()) {
-            PatioInstructionSerializer.serializeCompilationUnitElement(element, builder);
+            PatioSerializer.serializeCompilationUnitElement(element, builder);
             builder.append("\n");
         }
         builder.append("\n");
 
         builder.append("Instructions:\n\n");
-        PatioInstructionSerializer.serializeInstructions(
+        PatioSerializer.serializeInstructions(
             context.functionContext().instructions(),
             builder
         );
@@ -34,13 +35,13 @@ class PatioTesting {
 
     static String serializeCompilationUnitElement(PatioCompilationUnitElement element) {
         var builder = new StringBuilder();
-        PatioInstructionSerializer.serializeCompilationUnitElement(element, builder);
+        PatioSerializer.serializeCompilationUnitElement(element, builder);
         return builder.toString();
     }
 
     static String serializeInstruction(PatioInstruction instruction) {
         var builder = new StringBuilder();
-        PatioInstructionSerializer.serializeInstruction(instruction, builder);
+        PatioSerializer.serializeInstruction(instruction, builder);
         return builder.toString();
     }
 }
diff --git a/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java b/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java
index c9a01ce3..5924e1a0 100644
--- a/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java
+++ b/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java
@@ -1,5 +1,7 @@
 package org.shedlang.compiler.patio.instructions;
 
+import org.shedlang.compiler.patio.ast.PatioLocal;
+import org.shedlang.compiler.patio.ast.instructions.*;
 import org.shedlang.compiler.sources.Sources;
 
 import java.util.List;