Move code into compiler subpackage

22 files changed, 45 insertions, 39 deletions

diff --git a/src/main/java/org/zwobble/hobgoblin/ast/untyped/UntypedNode.java b/src/main/java/org/zwobble/hobgoblin/ast/untyped/UntypedNode.java
deleted file mode 100644
index cadc7e4..0000000
--- a/src/main/java/org/zwobble/hobgoblin/ast/untyped/UntypedNode.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.zwobble.hobgoblin.ast.untyped;
-
-import org.zwobble.hobgoblin.sources.Source;
-
-public interface UntypedNode {
-    Source source();
-}
diff --git a/src/main/java/org/zwobble/hobgoblin/ast/untyped/UntypedNamespaceNode.java b/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedNamespaceNode.java
index 0e74a2d..d4d98d3 100644
--- a/src/main/java/org/zwobble/hobgoblin/ast/untyped/UntypedNamespaceNode.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedNamespaceNode.java
@@ -1,7 +1,7 @@
-package org.zwobble.hobgoblin.ast.untyped;
+package org.zwobble.hobgoblin.compiler.ast.untyped;
 
-import org.zwobble.hobgoblin.sources.Source;
-import org.zwobble.hobgoblin.types.NamespaceName;
+import org.zwobble.hobgoblin.compiler.sources.Source;
+import org.zwobble.hobgoblin.compiler.types.NamespaceName;
 
 import java.util.List;
 
diff --git a/src/main/java/org/zwobble/hobgoblin/ast/untyped/UntypedNamespaceStatementNode.java b/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedNamespaceStatementNode.java
index e1cda4c..c7b4cac 100644
--- a/src/main/java/org/zwobble/hobgoblin/ast/untyped/UntypedNamespaceStatementNode.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedNamespaceStatementNode.java
@@ -1,4 +1,4 @@
-package org.zwobble.hobgoblin.ast.untyped;
+package org.zwobble.hobgoblin.compiler.ast.untyped;
 
 public sealed interface UntypedNamespaceStatementNode extends UntypedNode permits UntypedStructDefinitionNode {
 }
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedNode.java b/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedNode.java
new file mode 100644
index 0000000..c816495
--- /dev/null
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedNode.java
@@ -0,0 +1,7 @@
+package org.zwobble.hobgoblin.compiler.ast.untyped;
+
+import org.zwobble.hobgoblin.compiler.sources.Source;
+
+public interface UntypedNode {
+    Source source();
+}
diff --git a/src/main/java/org/zwobble/hobgoblin/ast/untyped/UntypedStructDefinitionNode.java b/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedStructDefinitionNode.java
index 87f1a8a..e86b141 100644
--- a/src/main/java/org/zwobble/hobgoblin/ast/untyped/UntypedStructDefinitionNode.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedStructDefinitionNode.java
@@ -1,6 +1,6 @@
-package org.zwobble.hobgoblin.ast.untyped;
+package org.zwobble.hobgoblin.compiler.ast.untyped;
 
-import org.zwobble.hobgoblin.sources.Source;
+import org.zwobble.hobgoblin.compiler.sources.Source;
 
 public record UntypedStructDefinitionNode(
     String name,
diff --git a/src/main/java/org/zwobble/hobgoblin/errors/SourceError.java b/src/main/java/org/zwobble/hobgoblin/compiler/errors/SourceError.java
index 1ebb679..afeb9b4 100644
--- a/src/main/java/org/zwobble/hobgoblin/errors/SourceError.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/errors/SourceError.java
@@ -1,4 +1,4 @@
-package org.zwobble.hobgoblin.errors;
+package org.zwobble.hobgoblin.compiler.errors;
 
 import org.zwobble.sourcetext.SourceRange;
 
diff --git a/src/main/java/org/zwobble/hobgoblin/parser/ParseError.java b/src/main/java/org/zwobble/hobgoblin/compiler/parser/ParseError.java
index 16b0c4f..78d063d 100644
--- a/src/main/java/org/zwobble/hobgoblin/parser/ParseError.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/parser/ParseError.java
@@ -1,6 +1,6 @@
-package org.zwobble.hobgoblin.parser;
+package org.zwobble.hobgoblin.compiler.parser;
 
-import org.zwobble.hobgoblin.errors.SourceError;
+import org.zwobble.hobgoblin.compiler.errors.SourceError;
 import org.zwobble.sourcetext.SourceRange;
 
 public class ParseError extends SourceError {
diff --git a/src/main/java/org/zwobble/hobgoblin/parser/Parser.java b/src/main/java/org/zwobble/hobgoblin/compiler/parser/Parser.java
index 7e6c3fe..704f34f 100644
--- a/src/main/java/org/zwobble/hobgoblin/parser/Parser.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/parser/Parser.java
@@ -1,9 +1,9 @@
-package org.zwobble.hobgoblin.parser;
+package org.zwobble.hobgoblin.compiler.parser;
 
-import org.zwobble.hobgoblin.ast.untyped.UntypedNamespaceNode;
-import org.zwobble.hobgoblin.sources.FileFragmentSource;
-import org.zwobble.hobgoblin.sources.Source;
-import org.zwobble.hobgoblin.types.NamespaceName;
+import org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNamespaceNode;
+import org.zwobble.hobgoblin.compiler.sources.FileFragmentSource;
+import org.zwobble.hobgoblin.compiler.sources.Source;
+import org.zwobble.hobgoblin.compiler.types.NamespaceName;
 import org.zwobble.sourcetext.SourcePosition;
 
 import java.util.List;
diff --git a/src/main/java/org/zwobble/hobgoblin/parser/Token.java b/src/main/java/org/zwobble/hobgoblin/compiler/parser/Token.java
index a3edf50..2cfa085 100644
--- a/src/main/java/org/zwobble/hobgoblin/parser/Token.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/parser/Token.java
@@ -1,4 +1,4 @@
-package org.zwobble.hobgoblin.parser;
+package org.zwobble.hobgoblin.compiler.parser;
 
 import org.zwobble.sourcetext.SourceRange;
 
diff --git a/src/main/java/org/zwobble/hobgoblin/parser/TokenIterator.java b/src/main/java/org/zwobble/hobgoblin/compiler/parser/TokenIterator.java
index f64d51f..9e1dd9c 100644
--- a/src/main/java/org/zwobble/hobgoblin/parser/TokenIterator.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/parser/TokenIterator.java
@@ -1,4 +1,4 @@
-package org.zwobble.hobgoblin.parser;
+package org.zwobble.hobgoblin.compiler.parser;
 
 import org.zwobble.sourcetext.SourcePosition;
 
diff --git a/src/main/java/org/zwobble/hobgoblin/parser/TokenType.java b/src/main/java/org/zwobble/hobgoblin/compiler/parser/TokenType.java
index 100ee77..72b1e88 100644
--- a/src/main/java/org/zwobble/hobgoblin/parser/TokenType.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/parser/TokenType.java
@@ -1,4 +1,4 @@
-package org.zwobble.hobgoblin.parser;
+package org.zwobble.hobgoblin.compiler.parser;
 
 enum TokenType {
     END,
diff --git a/src/main/java/org/zwobble/hobgoblin/parser/Tokenizer.java b/src/main/java/org/zwobble/hobgoblin/compiler/parser/Tokenizer.java
index 82c843d..c628346 100644
--- a/src/main/java/org/zwobble/hobgoblin/parser/Tokenizer.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/parser/Tokenizer.java
@@ -1,4 +1,4 @@
-package org.zwobble.hobgoblin.parser;
+package org.zwobble.hobgoblin.compiler.parser;
 
 import org.zwobble.sourcetext.SourceCharacterIterator;
 import org.zwobble.sourcetext.SourcePosition;
diff --git a/src/main/java/org/zwobble/hobgoblin/parser/Tokens.java b/src/main/java/org/zwobble/hobgoblin/compiler/parser/Tokens.java
index 3e979a3..618114e 100644
--- a/src/main/java/org/zwobble/hobgoblin/parser/Tokens.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/parser/Tokens.java
@@ -1,4 +1,4 @@
-package org.zwobble.hobgoblin.parser;
+package org.zwobble.hobgoblin.compiler.parser;
 
 import java.util.List;
 
diff --git a/src/main/java/org/zwobble/hobgoblin/parser/UnexpectedTokenError.java b/src/main/java/org/zwobble/hobgoblin/compiler/parser/UnexpectedTokenError.java
index 2ff6e2c..543aeb4 100644
--- a/src/main/java/org/zwobble/hobgoblin/parser/UnexpectedTokenError.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/parser/UnexpectedTokenError.java
@@ -1,6 +1,6 @@
-package org.zwobble.hobgoblin.parser;
+package org.zwobble.hobgoblin.compiler.parser;
 
-import org.zwobble.hobgoblin.errors.SourceError;
+import org.zwobble.hobgoblin.compiler.errors.SourceError;
 
 public class UnexpectedTokenError extends SourceError {
     private final String expected;
diff --git a/src/main/java/org/zwobble/hobgoblin/sources/FileFragmentSource.java b/src/main/java/org/zwobble/hobgoblin/compiler/sources/FileFragmentSource.java
index 25116dc..016a74c 100644
--- a/src/main/java/org/zwobble/hobgoblin/sources/FileFragmentSource.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/sources/FileFragmentSource.java
@@ -1,4 +1,4 @@
-package org.zwobble.hobgoblin.sources;
+package org.zwobble.hobgoblin.compiler.sources;
 
 import org.zwobble.sourcetext.SourceRange;
 
diff --git a/src/main/java/org/zwobble/hobgoblin/sources/NullSource.java b/src/main/java/org/zwobble/hobgoblin/compiler/sources/NullSource.java
index 61cc36d..8937951 100644
--- a/src/main/java/org/zwobble/hobgoblin/sources/NullSource.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/sources/NullSource.java
@@ -1,4 +1,4 @@
-package org.zwobble.hobgoblin.sources;
+package org.zwobble.hobgoblin.compiler.sources;
 
 public class NullSource implements Source {
     private NullSource() {
diff --git a/src/main/java/org/zwobble/hobgoblin/sources/RuntimeSource.java b/src/main/java/org/zwobble/hobgoblin/compiler/sources/RuntimeSource.java
index 7c23bfa..aec5683 100644
--- a/src/main/java/org/zwobble/hobgoblin/sources/RuntimeSource.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/sources/RuntimeSource.java
@@ -1,4 +1,4 @@
-package org.zwobble.hobgoblin.sources;
+package org.zwobble.hobgoblin.compiler.sources;
 
 public class RuntimeSource implements Source {
     private RuntimeSource() {
diff --git a/src/main/java/org/zwobble/hobgoblin/sources/Source.java b/src/main/java/org/zwobble/hobgoblin/compiler/sources/Source.java
index 2debfa6..aecf30b 100644
--- a/src/main/java/org/zwobble/hobgoblin/sources/Source.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/sources/Source.java
@@ -1,4 +1,4 @@
-package org.zwobble.hobgoblin.sources;
+package org.zwobble.hobgoblin.compiler.sources;
 
 public interface Source {
     String describe();
diff --git a/src/main/java/org/zwobble/hobgoblin/types/NamespaceName.java b/src/main/java/org/zwobble/hobgoblin/compiler/types/NamespaceName.java
index 143d0c4..e0fb2d3 100644
--- a/src/main/java/org/zwobble/hobgoblin/types/NamespaceName.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/types/NamespaceName.java
@@ -1,4 +1,4 @@
-package org.zwobble.hobgoblin.types;
+package org.zwobble.hobgoblin.compiler.types;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/test/java/org/zwobble/hobgoblin/parser/ParserNamespaceTests.java b/src/test/java/org/zwobble/hobgoblin/compiler/parser/ParserNamespaceTests.java
index 89527e9..e5796e4 100644
--- a/src/test/java/org/zwobble/hobgoblin/parser/ParserNamespaceTests.java
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/parser/ParserNamespaceTests.java
@@ -1,10 +1,10 @@
-package org.zwobble.hobgoblin.parser;
+package org.zwobble.hobgoblin.compiler.parser;
 
 import org.junit.jupiter.api.Test;
-import org.zwobble.hobgoblin.ast.untyped.UntypedNamespaceNode;
-import org.zwobble.hobgoblin.types.NamespaceName;
+import org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNamespaceNode;
+import org.zwobble.hobgoblin.compiler.types.NamespaceName;
 
-import static org.zwobble.hobgoblin.parser.ParserTesting.parseString;
+import static org.zwobble.hobgoblin.compiler.parser.ParserTesting.parseString;
 import static org.zwobble.precisely.AssertThat.assertThat;
 import static org.zwobble.precisely.Matchers.*;
 
diff --git a/src/test/java/org/zwobble/hobgoblin/parser/ParserTesting.java b/src/test/java/org/zwobble/hobgoblin/compiler/parser/ParserTesting.java
index 14cfb62..6fec759 100644
--- a/src/test/java/org/zwobble/hobgoblin/parser/ParserTesting.java
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/parser/ParserTesting.java
@@ -1,5 +1,8 @@
-package org.zwobble.hobgoblin.parser;
+package org.zwobble.hobgoblin.compiler.parser;
 
+import org.zwobble.hobgoblin.compiler.parser.TokenIterator;
+import org.zwobble.hobgoblin.compiler.parser.TokenType;
+import org.zwobble.hobgoblin.compiler.parser.Tokenizer;
 import org.zwobble.sourcetext.SourceText;
 
 import java.util.function.Function;
diff --git a/src/test/java/org/zwobble/hobgoblin/parser/TokenizerTests.java b/src/test/java/org/zwobble/hobgoblin/compiler/parser/TokenizerTests.java
index 6f77470..e564e7b 100644
--- a/src/test/java/org/zwobble/hobgoblin/parser/TokenizerTests.java
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/parser/TokenizerTests.java
@@ -1,6 +1,9 @@
-package org.zwobble.hobgoblin.parser;
+package org.zwobble.hobgoblin.compiler.parser;
 
 import org.junit.jupiter.api.Test;
+import org.zwobble.hobgoblin.compiler.parser.Token;
+import org.zwobble.hobgoblin.compiler.parser.TokenType;
+import org.zwobble.hobgoblin.compiler.parser.Tokenizer;
 import org.zwobble.sourcetext.SourceRange;
 import org.zwobble.sourcetext.SourceText;