From 85e0fc7a603e832205a7eef34930e8901fefd77d Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Wed, 11 Dec 2024 20:51:26 +0000
Subject: Parse methods in extend inline node

---
 .../shedlang/compiler/ast/untyped/UntypedExtendInlineNode.java   | 3 +++
 src/main/java/org/shedlang/compiler/parser/Parser.java           | 9 ++++++++-
 .../org/shedlang/compiler/typechecker/DeclaredVariables.java     | 3 +++
 src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java | 7 +++++++
 4 files changed, 21 insertions(+), 1 deletion(-)

(limited to 'src/main/java')

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);
 
-- 
cgit v1.2.3