Extract code for representing and serializing trees

10 files changed, 140 insertions, 112 deletions

diff --git a/src/main/java/org/shedlang/compiler/stackir/InstructionSerializer.java b/src/main/java/org/shedlang/compiler/stackir/InstructionSerializer.java
index 17d778df..c2c19f06 100644
--- a/src/main/java/org/shedlang/compiler/stackir/InstructionSerializer.java
+++ b/src/main/java/org/shedlang/compiler/stackir/InstructionSerializer.java
@@ -1,11 +1,12 @@
 package org.shedlang.compiler.stackir;
 
 import org.shedlang.compiler.stackir.instructions.*;
+import org.shedlang.compiler.treetext.Tree;
 
-import java.util.Arrays;
 import java.util.List;
 
-import static org.shedlang.compiler.util.Iterables.forEachInterspersed;
+import static org.shedlang.compiler.treetext.TreeSerializer.serializeTree;
+import static org.shedlang.compiler.treetext.Trees.*;
 
 public class InstructionSerializer {
     private InstructionSerializer() {
@@ -158,114 +159,4 @@ public class InstructionSerializer {
                 treeList(treeIdentifier("string-add"));
         };
     }
-
-    private static Tree treeIdentifier(String name) {
-        return new TreeIdentifier(name);
-    }
-
-    private static Tree treeInt(int value) {
-        return new TreeInt(value);
-    }
-
-    private static Tree treeList(List<Tree> children) {
-        return new TreeList(children);
-    }
-
-    private static Tree treeList(Tree... children) {
-        return new TreeList(Arrays.asList(children));
-    }
-
-    private static Tree treeListIndented(List<Tree> children) {
-        return new TreeListIndented(children);
-    }
-
-    private static Tree treeListIndented(Tree... children) {
-        return new TreeListIndented(Arrays.asList(children));
-    }
-
-    private static Tree treeNamed(String name, Tree value) {
-        return new TreeNamed(name, value);
-    }
-
-    private static Tree treeString(String value) {
-        return new TreeString(value);
-    }
-
-    private sealed interface Tree {}
-
-    private record TreeIdentifier(String name) implements Tree {
-    }
-
-    private record TreeInt(int value) implements Tree {
-    }
-
-    private record TreeList(List<Tree> children) implements Tree {
-    }
-
-    private record TreeListIndented(List<Tree> children) implements Tree {
-    }
-
-    private record TreeNamed(String name, Tree value) implements Tree {
-    }
-
-    private record TreeString(String value) implements Tree {
-    }
-
-    private static void serializeTree(Tree tree, StringBuilder builder, int indentation) {
-        switch (tree) {
-            case TreeIdentifier identifier -> {
-                builder.append(identifier.name);
-            }
-            case TreeInt treeInt -> {
-                builder.append(treeInt.value);
-            }
-            case TreeList list -> {
-                builder.append("(");
-                forEachInterspersed(
-                    list.children,
-                    child -> serializeTree(child, builder, indentation),
-                    () -> builder.append(" ")
-                );
-                builder.append(")");
-            }
-            case TreeListIndented list -> {
-                builder.append("(");
-                forEachInterspersed(
-                    list.children,
-                    child -> {
-                        newLine(indentation + 1, builder);
-                        serializeTree(child, builder, indentation + 1);
-                    },
-                    () -> {}
-                );
-                newLine(indentation, builder);
-                builder.append(")");
-            }
-            case TreeNamed named -> {
-                builder.append(named.name);
-                builder.append("=");
-                serializeTree(named.value, builder, indentation);
-            }
-            case TreeString string -> {
-                builder.append("\"");
-                var escapedValue = string.value
-                    .replace("\\", "\\\\")
-                    .replace("\b", "\\b")
-                    .replace("\t", "\\t")
-                    .replace("\n", "\\n")
-                    .replace("\f", "\\f")
-                    .replace("\r", "\\r")
-                    .replace("\"", "\\\"");
-                builder.append(escapedValue);
-                builder.append("\"");
-            }
-        }
-    }
-
-    private static void newLine(int indentation, StringBuilder builder) {
-        builder.append("\n");
-        for (var i = 0; i < indentation; i++) {
-            builder.append("    ");
-        }
-    }
 }
diff --git a/src/main/java/org/shedlang/compiler/treetext/Tree.java b/src/main/java/org/shedlang/compiler/treetext/Tree.java
new file mode 100644
index 00000000..d8fa2076
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/treetext/Tree.java
@@ -0,0 +1,4 @@
+package org.shedlang.compiler.treetext;
+
+public sealed interface Tree permits TreeIdentifier, TreeInt, TreeList, TreeListIndented, TreeNamed, TreeString {
+}
diff --git a/src/main/java/org/shedlang/compiler/treetext/TreeIdentifier.java b/src/main/java/org/shedlang/compiler/treetext/TreeIdentifier.java
new file mode 100644
index 00000000..e433c47a
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/treetext/TreeIdentifier.java
@@ -0,0 +1,4 @@
+package org.shedlang.compiler.treetext;
+
+public record TreeIdentifier(String name) implements Tree {
+}
diff --git a/src/main/java/org/shedlang/compiler/treetext/TreeInt.java b/src/main/java/org/shedlang/compiler/treetext/TreeInt.java
new file mode 100644
index 00000000..254f9b61
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/treetext/TreeInt.java
@@ -0,0 +1,4 @@
+package org.shedlang.compiler.treetext;
+
+public record TreeInt(int value) implements Tree {
+}
diff --git a/src/main/java/org/shedlang/compiler/treetext/TreeList.java b/src/main/java/org/shedlang/compiler/treetext/TreeList.java
new file mode 100644
index 00000000..07c851f9
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/treetext/TreeList.java
@@ -0,0 +1,6 @@
+package org.shedlang.compiler.treetext;
+
+import java.util.List;
+
+public record TreeList(List<Tree> children) implements Tree {
+}
diff --git a/src/main/java/org/shedlang/compiler/treetext/TreeListIndented.java b/src/main/java/org/shedlang/compiler/treetext/TreeListIndented.java
new file mode 100644
index 00000000..22f0ff15
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/treetext/TreeListIndented.java
@@ -0,0 +1,6 @@
+package org.shedlang.compiler.treetext;
+
+import java.util.List;
+
+public record TreeListIndented(List<Tree> children) implements Tree {
+}
diff --git a/src/main/java/org/shedlang/compiler/treetext/TreeNamed.java b/src/main/java/org/shedlang/compiler/treetext/TreeNamed.java
new file mode 100644
index 00000000..457c5043
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/treetext/TreeNamed.java
@@ -0,0 +1,4 @@
+package org.shedlang.compiler.treetext;
+
+public record TreeNamed(String name, Tree value) implements Tree {
+}
diff --git a/src/main/java/org/shedlang/compiler/treetext/TreeSerializer.java b/src/main/java/org/shedlang/compiler/treetext/TreeSerializer.java
new file mode 100644
index 00000000..d232d6b8
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/treetext/TreeSerializer.java
@@ -0,0 +1,65 @@
+package org.shedlang.compiler.treetext;
+
+import static org.shedlang.compiler.util.Iterables.forEachInterspersed;
+
+public class TreeSerializer {
+    private TreeSerializer() {}
+
+    public static void serializeTree(Tree tree, StringBuilder builder, int indentation) {
+        switch (tree) {
+            case TreeIdentifier identifier -> {
+                builder.append(identifier.name());
+            }
+            case TreeInt treeInt -> {
+                builder.append(treeInt.value());
+            }
+            case TreeList list -> {
+                builder.append("(");
+                forEachInterspersed(
+                    list.children(),
+                    child -> serializeTree(child, builder, indentation),
+                    () -> builder.append(" ")
+                );
+                builder.append(")");
+            }
+            case TreeListIndented list -> {
+                builder.append("(");
+                forEachInterspersed(
+                    list.children(),
+                    child -> {
+                        newLine(indentation + 1, builder);
+                        serializeTree(child, builder, indentation + 1);
+                    },
+                    () -> {}
+                );
+                newLine(indentation, builder);
+                builder.append(")");
+            }
+            case TreeNamed named -> {
+                builder.append(named.name());
+                builder.append("=");
+                serializeTree(named.value(), builder, indentation);
+            }
+            case TreeString string -> {
+                builder.append("\"");
+                var escapedValue = string.value()
+                    .replace("\\", "\\\\")
+                    .replace("\b", "\\b")
+                    .replace("\t", "\\t")
+                    .replace("\n", "\\n")
+                    .replace("\f", "\\f")
+                    .replace("\r", "\\r")
+                    .replace("\"", "\\\"");
+                builder.append(escapedValue);
+                builder.append("\"");
+            }
+        }
+    }
+
+    private static void newLine(int indentation, StringBuilder builder) {
+        builder.append("\n");
+        for (var i = 0; i < indentation; i++) {
+            builder.append("    ");
+        }
+    }
+}
diff --git a/src/main/java/org/shedlang/compiler/treetext/TreeString.java b/src/main/java/org/shedlang/compiler/treetext/TreeString.java
new file mode 100644
index 00000000..e281d268
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/treetext/TreeString.java
@@ -0,0 +1,4 @@
+package org.shedlang.compiler.treetext;
+
+public record TreeString(String value) implements Tree {
+}
diff --git a/src/main/java/org/shedlang/compiler/treetext/Trees.java b/src/main/java/org/shedlang/compiler/treetext/Trees.java
new file mode 100644
index 00000000..ba0e846a
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/treetext/Trees.java
@@ -0,0 +1,40 @@
+package org.shedlang.compiler.treetext;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class Trees {
+    private Trees() {}
+
+    public static Tree treeIdentifier(String name) {
+        return new TreeIdentifier(name);
+    }
+
+    public static Tree treeInt(int value) {
+        return new TreeInt(value);
+    }
+
+    public static Tree treeList(List<Tree> children) {
+        return new TreeList(children);
+    }
+
+    public static Tree treeList(Tree... children) {
+        return new TreeList(Arrays.asList(children));
+    }
+
+    public static Tree treeListIndented(List<Tree> children) {
+        return new TreeListIndented(children);
+    }
+
+    public static Tree treeListIndented(Tree... children) {
+        return new TreeListIndented(Arrays.asList(children));
+    }
+
+    public static Tree treeNamed(String name, Tree value) {
+        return new TreeNamed(name, value);
+    }
+
+    public static Tree treeString(String value) {
+        return new TreeString(value);
+    }
+}