Parse methods in extend inline node

6 files changed, 55 insertions, 3 deletions

diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedExtendInlineNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedExtendInlineNode.java
index 1bb00b35..b92e2513 100644
--- a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedExtendInlineNode.java
+++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedExtendInlineNode.java
@@ -2,8 +2,11 @@ package org.shedlang.compiler.ast.untyped;
 
 import org.shedlang.compiler.sources.Source;
 
+import java.util.List;
+
 public record UntypedExtendInlineNode(
     UntypedTypeLevelExpressionNode extendedType,
+    List<UntypedFunctionDefinitionNode> methods,
     Source source
 ) implements UntypedNamespaceStatementNode {
 }
diff --git a/src/main/java/org/shedlang/compiler/parser/Parser.java b/src/main/java/org/shedlang/compiler/parser/Parser.java
index dba9620d..8d79439e 100644
--- a/src/main/java/org/shedlang/compiler/parser/Parser.java
+++ b/src/main/java/org/shedlang/compiler/parser/Parser.java
@@ -413,12 +413,19 @@ public class Parser {
         tokens.skip(TokenType.KEYWORD_EXTEND);
         var extendedType = parseTopLevelTypeLevelExpression(tokens);
         tokens.skip(TokenType.SYMBOL_BRACE_OPEN);
+
+        var methods = parseMany(
+            () -> tokens.isNext(TokenType.SYMBOL_BRACE_CLOSE),
+            () -> parseFunctionDefinition(tokens),
+            () -> true
+        );
+
         tokens.skip(TokenType.SYMBOL_BRACE_CLOSE);
 
         var end = tokens.position();
         var source = start.to(end);
 
-        return new UntypedExtendInlineNode(extendedType, source);
+        return new UntypedExtendInlineNode(extendedType, methods, source);
     }
 
     private static class FieldAccessParser implements OperationParser<
diff --git a/src/main/java/org/shedlang/compiler/typechecker/DeclaredVariables.java b/src/main/java/org/shedlang/compiler/typechecker/DeclaredVariables.java
index 2a842d93..6260abbd 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/DeclaredVariables.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/DeclaredVariables.java
@@ -98,6 +98,9 @@ class DeclaredVariables {
                     effectDefinition
                 ));
 
+            case UntypedExtendInlineNode extendInline ->
+                variables;
+
             case UntypedFunctionDefinitionNode functionDefinition ->
                 variables.plus(DeclaredVariable.fromNode(
                     VariableType.CONSTANT,
diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
index 8cec1f85..8d94c303 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
@@ -1447,6 +1447,10 @@ public class TypeChecker {
                     );
                 }
 
+                case UntypedExtendInlineNode untypedExtendInline -> {
+
+                }
+
                 case UntypedFunctionDefinitionNode untypedFunctionDefinition -> {
                     dependencyChecker = dependencyChecker.addDeferredDependencies(
                         untypedFunctionDefinition.name(),
@@ -1523,6 +1527,9 @@ public class TypeChecker {
             case UntypedEffectDefinitionNode effectDefinition ->
                 typeCheckStepsEffectDefinition(effectDefinition);
 
+            case UntypedExtendInlineNode extendInline ->
+                throw new UnsupportedOperationException("TODO");
+
             case UntypedFunctionDefinitionNode functionDefinition ->
                 typeCheckStepsFunctionDefinition(functionDefinition);
 
diff --git a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedExtendInlineNodeMatcher.java b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedExtendInlineNodeMatcher.java
index d8dc26a1..1c82f937 100644
--- a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedExtendInlineNodeMatcher.java
+++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedExtendInlineNodeMatcher.java
@@ -41,4 +41,14 @@ public class UntypedExtendInlineNodeMatcher extends MatcherBuilder<
             extendedType
         ));
     }
+
+    public UntypedExtendInlineNodeMatcher withMethods(
+        Matcher<Iterable<? extends UntypedFunctionDefinitionNode>> methods
+    ) {
+        return with(has(
+            "methods",
+            x -> x.methods(),
+            methods
+        ));
+    }
 }
diff --git a/src/test/java/org/shedlang/compiler/parser/ParserExtendInlineTests.java b/src/test/java/org/shedlang/compiler/parser/ParserExtendInlineTests.java
index 75030e4b..6652a46e 100644
--- a/src/test/java/org/shedlang/compiler/parser/ParserExtendInlineTests.java
+++ b/src/test/java/org/shedlang/compiler/parser/ParserExtendInlineTests.java
@@ -2,10 +2,10 @@ package org.shedlang.compiler.parser;
 
 import org.junit.jupiter.api.Test;
 
-import static org.shedlang.compiler.ast.untyped.UntypedNodeMatchers.isUntypedExtendInlineNode;
-import static org.shedlang.compiler.ast.untyped.UntypedNodeMatchers.isUntypedTypeLevelReferenceNode;
+import static org.shedlang.compiler.ast.untyped.UntypedNodeMatchers.*;
 import static org.shedlang.compiler.parser.ParserTesting.parseString;
 import static org.zwobble.precisely.AssertThat.assertThat;
+import static org.zwobble.precisely.Matchers.isSequence;
 
 public class ParserExtendInlineTests {
     @Test
@@ -20,6 +20,28 @@ public class ParserExtendInlineTests {
             node,
             isUntypedExtendInlineNode()
                 .withExtendedType(isUntypedTypeLevelReferenceNode("Count"))
+                .withMethods(isSequence())
+        );
+    }
+
+    @Test
+    public void canParseExtendInlineWithSingleMethod() {
+        var source = """
+            extend Count {
+                fun message(this) {
+                }
+            }
+        """;
+
+        var node = parseString(source, Parser::parseNamespaceStatement);
+
+        assertThat(
+            node,
+            isUntypedExtendInlineNode()
+                .withExtendedType(isUntypedTypeLevelReferenceNode("Count"))
+                .withMethods(isSequence(
+                    isUntypedFunctionDefinitionNode().withName("message")
+                ))
         );
     }
 }