From 27af53ebd256d9e593ade3fc84d0af0f8a074f41 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Mon, 20 Apr 2026 13:56:36 +0100 Subject: Move code into compiler subpackage --- .../compiler/parser/ParserNamespaceTests.java | 27 ++++++ .../hobgoblin/compiler/parser/ParserTesting.java | 25 ++++++ .../hobgoblin/compiler/parser/TokenizerTests.java | 95 ++++++++++++++++++++++ .../hobgoblin/parser/ParserNamespaceTests.java | 27 ------ .../zwobble/hobgoblin/parser/ParserTesting.java | 22 ----- .../zwobble/hobgoblin/parser/TokenizerTests.java | 92 --------------------- 6 files changed, 147 insertions(+), 141 deletions(-) create mode 100644 src/test/java/org/zwobble/hobgoblin/compiler/parser/ParserNamespaceTests.java create mode 100644 src/test/java/org/zwobble/hobgoblin/compiler/parser/ParserTesting.java create mode 100644 src/test/java/org/zwobble/hobgoblin/compiler/parser/TokenizerTests.java delete mode 100644 src/test/java/org/zwobble/hobgoblin/parser/ParserNamespaceTests.java delete mode 100644 src/test/java/org/zwobble/hobgoblin/parser/ParserTesting.java delete mode 100644 src/test/java/org/zwobble/hobgoblin/parser/TokenizerTests.java (limited to 'src/test/java/org') diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/parser/ParserNamespaceTests.java b/src/test/java/org/zwobble/hobgoblin/compiler/parser/ParserNamespaceTests.java new file mode 100644 index 0000000..e5796e4 --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/parser/ParserNamespaceTests.java @@ -0,0 +1,27 @@ +package org.zwobble.hobgoblin.compiler.parser; + +import org.junit.jupiter.api.Test; +import org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNamespaceNode; +import org.zwobble.hobgoblin.compiler.types.NamespaceName; + +import static org.zwobble.hobgoblin.compiler.parser.ParserTesting.parseString; +import static org.zwobble.precisely.AssertThat.assertThat; +import static org.zwobble.precisely.Matchers.*; + +public class ParserNamespaceTests { + @Test + public void emptyNamespaceHasEmptyBody() { + var source = ""; + + var node = parseString( + source, + tokens -> Parser.parseNamespace(tokens, NamespaceName.of("Example", "Project")) + ); + + assertThat(node, instanceOf( + UntypedNamespaceNode.class, + has("namespaceName", x -> x.namespaceName(), equalTo(NamespaceName.of("Example", "Project"))), + has("body", x -> x.body(), isSequence()) + )); + } +} diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/parser/ParserTesting.java b/src/test/java/org/zwobble/hobgoblin/compiler/parser/ParserTesting.java new file mode 100644 index 0000000..6fec759 --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/parser/ParserTesting.java @@ -0,0 +1,25 @@ +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; + +import static org.zwobble.precisely.AssertThat.assertThat; +import static org.zwobble.precisely.Matchers.equalTo; + +public class ParserTesting { + public static T parseString( + String sourceContents, + Function parseTokens + ) { + var sourceText = SourceText.fromString("", sourceContents); + var tokens = Tokenizer.tokenize(sourceText); + var tokenIterator = tokens.iterator(); + var result = parseTokens.apply(tokenIterator); + assertThat(tokenIterator.peek().tokenType(), equalTo(TokenType.END)); + return result; + } +} diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/parser/TokenizerTests.java b/src/test/java/org/zwobble/hobgoblin/compiler/parser/TokenizerTests.java new file mode 100644 index 0000000..e564e7b --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/parser/TokenizerTests.java @@ -0,0 +1,95 @@ +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; + +import static org.zwobble.precisely.AssertThat.assertThat; +import static org.zwobble.precisely.Matchers.equalTo; +import static org.zwobble.precisely.Matchers.isSequence; + +public class TokenizerTests { + @Test + public void emptySourceTextIsTokenizedToEmpty() { + var sourceText = SourceText.fromString("", ""); + + var tokens = Tokenizer.tokenize(sourceText); + + assertThat(tokens.tokens(), isSequence()); + } + + @Test + public void keywordStructIsTokenized() { + var sourceText = SourceText.fromString("", "struct"); + + var tokens = Tokenizer.tokenize(sourceText); + + assertThat(tokens.tokens(), isSequence( + equalTo(new Token(TokenType.KEYWORD_STRUCT, sourceRange(sourceText, 0, 6))) + )); + } + + @Test + public void identifierIsTokenized() { + var sourceText = SourceText.fromString("", "blah"); + + var tokens = Tokenizer.tokenize(sourceText); + + assertThat(tokens.tokens(), isSequence( + equalTo(new Token(TokenType.IDENTIFIER, sourceRange(sourceText, 0, 4))) + )); + } + + @Test + public void symbolBraceOpenIsTokenized() { + var sourceText = SourceText.fromString("", "{"); + + var tokens = Tokenizer.tokenize(sourceText); + + assertThat(tokens.tokens(), isSequence( + equalTo(new Token(TokenType.SYMBOL_BRACE_OPEN, sourceRange(sourceText, 0, 1))) + )); + } + + @Test + public void symbolBraceCloseIsTokenized() { + var sourceText = SourceText.fromString("", "}"); + + var tokens = Tokenizer.tokenize(sourceText); + + assertThat(tokens.tokens(), isSequence( + equalTo(new Token(TokenType.SYMBOL_BRACE_CLOSE, sourceRange(sourceText, 0, 1))) + )); + } + + @Test + public void whitespaceIsIgnored() { + var sourceText = SourceText.fromString("", " blah "); + + var tokens = Tokenizer.tokenize(sourceText); + + assertThat(tokens.tokens(), isSequence( + equalTo(new Token(TokenType.IDENTIFIER, sourceRange(sourceText, 2, 6))) + )); + } + + @Test + public void whitespaceSeparatesOtherTokens() { + var sourceText = SourceText.fromString("", "one two \t three"); + + var tokens = Tokenizer.tokenize(sourceText); + + assertThat(tokens.tokens(), isSequence( + equalTo(new Token(TokenType.IDENTIFIER, sourceRange(sourceText, 0, 3))), + equalTo(new Token(TokenType.IDENTIFIER, sourceRange(sourceText, 4, 7))), + equalTo(new Token(TokenType.IDENTIFIER, sourceRange(sourceText, 10, 15))) + )); + } + + private static SourceRange sourceRange(SourceText sourceText, int fromCharacterIndex, int toCharacterIndex) { + return sourceText.characterPosition(fromCharacterIndex).to(sourceText.characterPosition(toCharacterIndex)); + } +} diff --git a/src/test/java/org/zwobble/hobgoblin/parser/ParserNamespaceTests.java b/src/test/java/org/zwobble/hobgoblin/parser/ParserNamespaceTests.java deleted file mode 100644 index 89527e9..0000000 --- a/src/test/java/org/zwobble/hobgoblin/parser/ParserNamespaceTests.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.zwobble.hobgoblin.parser; - -import org.junit.jupiter.api.Test; -import org.zwobble.hobgoblin.ast.untyped.UntypedNamespaceNode; -import org.zwobble.hobgoblin.types.NamespaceName; - -import static org.zwobble.hobgoblin.parser.ParserTesting.parseString; -import static org.zwobble.precisely.AssertThat.assertThat; -import static org.zwobble.precisely.Matchers.*; - -public class ParserNamespaceTests { - @Test - public void emptyNamespaceHasEmptyBody() { - var source = ""; - - var node = parseString( - source, - tokens -> Parser.parseNamespace(tokens, NamespaceName.of("Example", "Project")) - ); - - assertThat(node, instanceOf( - UntypedNamespaceNode.class, - has("namespaceName", x -> x.namespaceName(), equalTo(NamespaceName.of("Example", "Project"))), - has("body", x -> x.body(), isSequence()) - )); - } -} diff --git a/src/test/java/org/zwobble/hobgoblin/parser/ParserTesting.java b/src/test/java/org/zwobble/hobgoblin/parser/ParserTesting.java deleted file mode 100644 index 14cfb62..0000000 --- a/src/test/java/org/zwobble/hobgoblin/parser/ParserTesting.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zwobble.hobgoblin.parser; - -import org.zwobble.sourcetext.SourceText; - -import java.util.function.Function; - -import static org.zwobble.precisely.AssertThat.assertThat; -import static org.zwobble.precisely.Matchers.equalTo; - -public class ParserTesting { - public static T parseString( - String sourceContents, - Function parseTokens - ) { - var sourceText = SourceText.fromString("", sourceContents); - var tokens = Tokenizer.tokenize(sourceText); - var tokenIterator = tokens.iterator(); - var result = parseTokens.apply(tokenIterator); - assertThat(tokenIterator.peek().tokenType(), equalTo(TokenType.END)); - return result; - } -} diff --git a/src/test/java/org/zwobble/hobgoblin/parser/TokenizerTests.java b/src/test/java/org/zwobble/hobgoblin/parser/TokenizerTests.java deleted file mode 100644 index 6f77470..0000000 --- a/src/test/java/org/zwobble/hobgoblin/parser/TokenizerTests.java +++ /dev/null @@ -1,92 +0,0 @@ -package org.zwobble.hobgoblin.parser; - -import org.junit.jupiter.api.Test; -import org.zwobble.sourcetext.SourceRange; -import org.zwobble.sourcetext.SourceText; - -import static org.zwobble.precisely.AssertThat.assertThat; -import static org.zwobble.precisely.Matchers.equalTo; -import static org.zwobble.precisely.Matchers.isSequence; - -public class TokenizerTests { - @Test - public void emptySourceTextIsTokenizedToEmpty() { - var sourceText = SourceText.fromString("", ""); - - var tokens = Tokenizer.tokenize(sourceText); - - assertThat(tokens.tokens(), isSequence()); - } - - @Test - public void keywordStructIsTokenized() { - var sourceText = SourceText.fromString("", "struct"); - - var tokens = Tokenizer.tokenize(sourceText); - - assertThat(tokens.tokens(), isSequence( - equalTo(new Token(TokenType.KEYWORD_STRUCT, sourceRange(sourceText, 0, 6))) - )); - } - - @Test - public void identifierIsTokenized() { - var sourceText = SourceText.fromString("", "blah"); - - var tokens = Tokenizer.tokenize(sourceText); - - assertThat(tokens.tokens(), isSequence( - equalTo(new Token(TokenType.IDENTIFIER, sourceRange(sourceText, 0, 4))) - )); - } - - @Test - public void symbolBraceOpenIsTokenized() { - var sourceText = SourceText.fromString("", "{"); - - var tokens = Tokenizer.tokenize(sourceText); - - assertThat(tokens.tokens(), isSequence( - equalTo(new Token(TokenType.SYMBOL_BRACE_OPEN, sourceRange(sourceText, 0, 1))) - )); - } - - @Test - public void symbolBraceCloseIsTokenized() { - var sourceText = SourceText.fromString("", "}"); - - var tokens = Tokenizer.tokenize(sourceText); - - assertThat(tokens.tokens(), isSequence( - equalTo(new Token(TokenType.SYMBOL_BRACE_CLOSE, sourceRange(sourceText, 0, 1))) - )); - } - - @Test - public void whitespaceIsIgnored() { - var sourceText = SourceText.fromString("", " blah "); - - var tokens = Tokenizer.tokenize(sourceText); - - assertThat(tokens.tokens(), isSequence( - equalTo(new Token(TokenType.IDENTIFIER, sourceRange(sourceText, 2, 6))) - )); - } - - @Test - public void whitespaceSeparatesOtherTokens() { - var sourceText = SourceText.fromString("", "one two \t three"); - - var tokens = Tokenizer.tokenize(sourceText); - - assertThat(tokens.tokens(), isSequence( - equalTo(new Token(TokenType.IDENTIFIER, sourceRange(sourceText, 0, 3))), - equalTo(new Token(TokenType.IDENTIFIER, sourceRange(sourceText, 4, 7))), - equalTo(new Token(TokenType.IDENTIFIER, sourceRange(sourceText, 10, 15))) - )); - } - - private static SourceRange sourceRange(SourceText sourceText, int fromCharacterIndex, int toCharacterIndex) { - return sourceText.characterPosition(fromCharacterIndex).to(sourceText.characterPosition(toCharacterIndex)); - } -} -- cgit v1.2.3