diff options
| author | Michael Williamson <mike@zwobble.org> | 2026-04-22 11:34:09 +0100 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2026-04-22 11:34:09 +0100 |
| commit | 3f54b73a61e2fbe29e6e33dff4bb0b6e8bbf31f1 (patch) | |
| tree | 7aac2e9f396182a54a258d97e06c357ac280d5d9 /src/main/java | |
| parent | 371a4e8db3aa6fdc0a6d144351e9c0169c13badf (diff) | |
Parse empty struct definitions
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/org/zwobble/hobgoblin/compiler/parser/Parser.java | 23 | ||||
| -rw-r--r-- | src/main/java/org/zwobble/hobgoblin/compiler/parser/TokenIterator.java | 10 |
2 files changed, 30 insertions, 3 deletions
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/parser/Parser.java b/src/main/java/org/zwobble/hobgoblin/compiler/parser/Parser.java index 4411306..e90518c 100644 --- a/src/main/java/org/zwobble/hobgoblin/compiler/parser/Parser.java +++ b/src/main/java/org/zwobble/hobgoblin/compiler/parser/Parser.java @@ -1,8 +1,6 @@ package org.zwobble.hobgoblin.compiler.parser; -import org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNamespaceNode; -import org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeLevelExpressionNode; -import org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeLevelReferenceNode; +import org.zwobble.hobgoblin.compiler.ast.untyped.*; import org.zwobble.hobgoblin.compiler.sources.FileFragmentSource; import org.zwobble.hobgoblin.compiler.sources.Source; import org.zwobble.hobgoblin.compiler.types.NamespaceName; @@ -30,6 +28,25 @@ public class Parser { ); } + public static UntypedNamespaceStatementNode parseNamespaceStatement( + TokenIterator tokens + ) { + var start = tokens.startPosition(); + + tokens.skip(TokenType.KEYWORD_STRUCT); + var name = tokens.next(TokenType.IDENTIFIER); + tokens.skip(TokenType.SYMBOL_BRACE_OPEN); + tokens.skip(TokenType.SYMBOL_BRACE_CLOSE); + + var end = tokens.endPosition(); + var source = createSource(start, end); + + return new UntypedStructDefinitionNode( + name.charSequence().toString(), + source + ); + } + public static UntypedTypeLevelExpressionNode parseTypeLevelExpression( TokenIterator tokens ) { diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/parser/TokenIterator.java b/src/main/java/org/zwobble/hobgoblin/compiler/parser/TokenIterator.java index cb59e79..177a87e 100644 --- a/src/main/java/org/zwobble/hobgoblin/compiler/parser/TokenIterator.java +++ b/src/main/java/org/zwobble/hobgoblin/compiler/parser/TokenIterator.java @@ -30,6 +30,16 @@ class TokenIterator { } } + public void skip(TokenType tokenType) { + var token = peek(); + if (token.tokenType().equals(tokenType)) { + this.tokenIndex++; + } else { + // TODO: better expected string + throw new UnexpectedTokenError(tokenType.toString(), token); + } + } + private Token getAbsolute(int index) { if (index < this.tokens.size()) { return this.tokens.get(index); |
