Tidy up structure of Patio AST

18 files changed, 39 insertions, 27 deletions

diff --git a/src/main/java/org/shedlang/compiler/patio/PatioCodeGen.java b/src/main/java/org/shedlang/compiler/patio/PatioCodeGen.java
index 13e77b53..ff0434dc 100644
--- a/src/main/java/org/shedlang/compiler/patio/PatioCodeGen.java
+++ b/src/main/java/org/shedlang/compiler/patio/PatioCodeGen.java
@@ -1,8 +1,8 @@
 package org.shedlang.compiler.patio;
 
-import org.shedlang.compiler.patio.instructions.PatioIntGet;
-import org.shedlang.compiler.patio.instructions.PatioLocal;
-import org.shedlang.compiler.patio.instructions.PatioReturn;
+import org.shedlang.compiler.patio.ast.instructions.PatioIntGet;
+import org.shedlang.compiler.patio.ast.PatioLocal;
+import org.shedlang.compiler.patio.ast.instructions.PatioReturn;
 import org.shedlang.compiler.sources.Source;
 import org.shedlang.compiler.stackir.instructions.*;
 
diff --git a/src/main/java/org/shedlang/compiler/patio/PatioCodeGenClosures.java b/src/main/java/org/shedlang/compiler/patio/PatioCodeGenClosures.java
index b7afeba2..839a0067 100644
--- a/src/main/java/org/shedlang/compiler/patio/PatioCodeGenClosures.java
+++ b/src/main/java/org/shedlang/compiler/patio/PatioCodeGenClosures.java
@@ -1,9 +1,9 @@
 package org.shedlang.compiler.patio;
 
 import org.shedlang.compiler.ast.typed.FreeVariables;
-import org.shedlang.compiler.patio.instructions.PatioCallPointer;
-import org.shedlang.compiler.patio.instructions.PatioLocal;
-import org.shedlang.compiler.patio.instructions.PatioMemoryLoad;
+import org.shedlang.compiler.patio.ast.instructions.PatioCallPointer;
+import org.shedlang.compiler.patio.ast.PatioLocal;
+import org.shedlang.compiler.patio.ast.instructions.PatioMemoryLoad;
 import org.shedlang.compiler.sources.Source;
 import org.shedlang.compiler.stackir.instructions.DefineFunctionInstruction;
 
diff --git a/src/main/java/org/shedlang/compiler/patio/PatioCodeGenContext.java b/src/main/java/org/shedlang/compiler/patio/PatioCodeGenContext.java
index dd67f9f8..42287560 100644
--- a/src/main/java/org/shedlang/compiler/patio/PatioCodeGenContext.java
+++ b/src/main/java/org/shedlang/compiler/patio/PatioCodeGenContext.java
@@ -5,7 +5,11 @@ import org.pcollections.PMap;
 import org.pcollections.PStack;
 import org.pcollections.PVector;
 import org.shedlang.compiler.backends.llvm.NameAllocator;
-import org.shedlang.compiler.patio.instructions.*;
+import org.shedlang.compiler.patio.ast.PatioCompilationUnitElement;
+import org.shedlang.compiler.patio.ast.PatioFunctionDefinition;
+import org.shedlang.compiler.patio.ast.PatioLocal;
+import org.shedlang.compiler.patio.ast.instructions.PatioInstruction;
+import org.shedlang.compiler.patio.ast.instructions.PatioLocalCopy;
 import org.shedlang.compiler.sources.Source;
 import org.shedlang.compiler.util.P;
 
diff --git a/src/main/java/org/shedlang/compiler/patio/instructions/PatioCompilationUnit.java b/src/main/java/org/shedlang/compiler/patio/ast/PatioCompilationUnit.java
index 6c4f4a1a..227c38d2 100644
--- a/src/main/java/org/shedlang/compiler/patio/instructions/PatioCompilationUnit.java
+++ b/src/main/java/org/shedlang/compiler/patio/ast/PatioCompilationUnit.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.instructions;
+package org.shedlang.compiler.patio.ast;
 
 import org.shedlang.compiler.sources.Source;
 
diff --git a/src/main/java/org/shedlang/compiler/patio/instructions/PatioCompilationUnitElement.java b/src/main/java/org/shedlang/compiler/patio/ast/PatioCompilationUnitElement.java
index 7d29e082..eecdd3c2 100644
--- a/src/main/java/org/shedlang/compiler/patio/instructions/PatioCompilationUnitElement.java
+++ b/src/main/java/org/shedlang/compiler/patio/ast/PatioCompilationUnitElement.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.instructions;
+package org.shedlang.compiler.patio.ast;
 
 import org.shedlang.compiler.sources.Source;
 
diff --git a/src/main/java/org/shedlang/compiler/patio/instructions/PatioFunctionDefinition.java b/src/main/java/org/shedlang/compiler/patio/ast/PatioFunctionDefinition.java
index 9a81a879..d421c290 100644
--- a/src/main/java/org/shedlang/compiler/patio/instructions/PatioFunctionDefinition.java
+++ b/src/main/java/org/shedlang/compiler/patio/ast/PatioFunctionDefinition.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.instructions;
+package org.shedlang.compiler.patio.ast;
 
 import org.shedlang.compiler.sources.Source;
 import org.shedlang.compiler.sources.Sources;
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/PatioLocal.java b/src/main/java/org/shedlang/compiler/patio/ast/PatioLocal.java
new file mode 100644
index 00000000..a5a7d9c5
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/patio/ast/PatioLocal.java
@@ -0,0 +1,4 @@
+package org.shedlang.compiler.patio.ast;
+
+public record PatioLocal(String name) {
+}
diff --git a/src/main/java/org/shedlang/compiler/patio/PatioInstructionSerializer.java b/src/main/java/org/shedlang/compiler/patio/ast/PatioSerializer.java
index c5966bf8..655e4fb4 100644
--- a/src/main/java/org/shedlang/compiler/patio/PatioInstructionSerializer.java
+++ b/src/main/java/org/shedlang/compiler/patio/ast/PatioSerializer.java
@@ -1,6 +1,6 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.patio.ast;
 
-import org.shedlang.compiler.patio.instructions.*;
+import org.shedlang.compiler.patio.ast.instructions.*;
 import org.shedlang.compiler.treetext.Tree;
 
 import java.util.List;
@@ -8,8 +8,8 @@ import java.util.List;
 import static org.shedlang.compiler.treetext.TreeSerializer.serializeTree;
 import static org.shedlang.compiler.treetext.Trees.*;
 
-public class PatioInstructionSerializer {
-    private PatioInstructionSerializer() {}
+public class PatioSerializer {
+    private PatioSerializer() {}
 
     public static void serializeCompilationUnitElement(
         PatioCompilationUnitElement element,
diff --git a/src/main/java/org/shedlang/compiler/patio/instructions/PatioAlloc.java b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioAlloc.java
index ae5599e0..61e3a6fe 100644
--- a/src/main/java/org/shedlang/compiler/patio/instructions/PatioAlloc.java
+++ b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioAlloc.java
@@ -1,5 +1,6 @@
-package org.shedlang.compiler.patio.instructions;
+package org.shedlang.compiler.patio.ast.instructions;
 
+import org.shedlang.compiler.patio.ast.PatioLocal;
 import org.shedlang.compiler.sources.Source;
 
 /**
diff --git a/src/main/java/org/shedlang/compiler/patio/instructions/PatioCallPointer.java b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioCallPointer.java
index 279a0c71..f2e81241 100644
--- a/src/main/java/org/shedlang/compiler/patio/instructions/PatioCallPointer.java
+++ b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioCallPointer.java
@@ -1,5 +1,6 @@
-package org.shedlang.compiler.patio.instructions;
+package org.shedlang.compiler.patio.ast.instructions;
 
+import org.shedlang.compiler.patio.ast.PatioLocal;
 import org.shedlang.compiler.sources.Source;
 
 import java.util.List;
diff --git a/src/main/java/org/shedlang/compiler/patio/instructions/PatioFunctionPointerGet.java b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioFunctionPointerGet.java
index 9e548464..3ab85137 100644
--- a/src/main/java/org/shedlang/compiler/patio/instructions/PatioFunctionPointerGet.java
+++ b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioFunctionPointerGet.java
@@ -1,5 +1,6 @@
-package org.shedlang.compiler.patio.instructions;
+package org.shedlang.compiler.patio.ast.instructions;
 
+import org.shedlang.compiler.patio.ast.PatioLocal;
 import org.shedlang.compiler.sources.Source;
 
 /**
diff --git a/src/main/java/org/shedlang/compiler/patio/instructions/PatioInstruction.java b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioInstruction.java
index c7ce5e85..4cff67b4 100644
--- a/src/main/java/org/shedlang/compiler/patio/instructions/PatioInstruction.java
+++ b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioInstruction.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.instructions;
+package org.shedlang.compiler.patio.ast.instructions;
 
 import org.shedlang.compiler.sources.Source;
 
diff --git a/src/main/java/org/shedlang/compiler/patio/instructions/PatioIntGet.java b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioIntGet.java
index 0d1bbfc2..2b92dd3d 100644
--- a/src/main/java/org/shedlang/compiler/patio/instructions/PatioIntGet.java
+++ b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioIntGet.java
@@ -1,5 +1,6 @@
-package org.shedlang.compiler.patio.instructions;
+package org.shedlang.compiler.patio.ast.instructions;
 
+import org.shedlang.compiler.patio.ast.PatioLocal;
 import org.shedlang.compiler.sources.Source;
 
 /**
diff --git a/src/main/java/org/shedlang/compiler/patio/instructions/PatioLocalCopy.java b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioLocalCopy.java
index da3d92e2..0fccbce8 100644
--- a/src/main/java/org/shedlang/compiler/patio/instructions/PatioLocalCopy.java
+++ b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioLocalCopy.java
@@ -1,5 +1,6 @@
-package org.shedlang.compiler.patio.instructions;
+package org.shedlang.compiler.patio.ast.instructions;
 
+import org.shedlang.compiler.patio.ast.PatioLocal;
 import org.shedlang.compiler.sources.Source;
 
 /**
diff --git a/src/main/java/org/shedlang/compiler/patio/instructions/PatioMemoryLoad.java b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioMemoryLoad.java
index cab95107..793445a0 100644
--- a/src/main/java/org/shedlang/compiler/patio/instructions/PatioMemoryLoad.java
+++ b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioMemoryLoad.java
@@ -1,5 +1,6 @@
-package org.shedlang.compiler.patio.instructions;
+package org.shedlang.compiler.patio.ast.instructions;
 
+import org.shedlang.compiler.patio.ast.PatioLocal;
 import org.shedlang.compiler.sources.Source;
 
 /**
diff --git a/src/main/java/org/shedlang/compiler/patio/instructions/PatioMemoryStore.java b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioMemoryStore.java
index 67776381..444cbf1d 100644
--- a/src/main/java/org/shedlang/compiler/patio/instructions/PatioMemoryStore.java
+++ b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioMemoryStore.java
@@ -1,5 +1,6 @@
-package org.shedlang.compiler.patio.instructions;
+package org.shedlang.compiler.patio.ast.instructions;
 
+import org.shedlang.compiler.patio.ast.PatioLocal;
 import org.shedlang.compiler.sources.Source;
 
 /**
diff --git a/src/main/java/org/shedlang/compiler/patio/instructions/PatioReturn.java b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioReturn.java
index 81327631..1d022275 100644
--- a/src/main/java/org/shedlang/compiler/patio/instructions/PatioReturn.java
+++ b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioReturn.java
@@ -1,5 +1,6 @@
-package org.shedlang.compiler.patio.instructions;
+package org.shedlang.compiler.patio.ast.instructions;
 
+import org.shedlang.compiler.patio.ast.PatioLocal;
 import org.shedlang.compiler.sources.Source;
 
 /**
diff --git a/src/main/java/org/shedlang/compiler/patio/instructions/PatioLocal.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioLocal.java
deleted file mode 100644
index 97590ffe..00000000
--- a/src/main/java/org/shedlang/compiler/patio/instructions/PatioLocal.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.shedlang.compiler.patio.instructions;
-
-public record PatioLocal(String name) {
-}