diff options
| author | Michael Williamson <mike@zwobble.org> | 2025-03-02 19:22:23 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2025-03-02 19:22:23 +0000 |
| commit | ec9845967d37ad678249e9857e253af4c04e8e4e (patch) | |
| tree | e1f2d552c29c6e7959c02b8d6ae153b6e485b4c2 /src | |
| parent | fe0cb0f6ed1be2da385a10fcb72734b5e01d57ca (diff) | |
Type check native type methods
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java | 64 | ||||
| -rw-r--r-- | src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNativeTypeDeclarationTests.java | 38 |
2 files changed, 97 insertions, 5 deletions
diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java index d7f15fc4..59f961ab 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java +++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java @@ -1722,6 +1722,12 @@ public class TypeChecker { }; } + private record TypeCheckNativeTypeDeclarationState( + TypeOrConstructor<SimpleNativeType> typeOrConstructor, + List<TypedNativeFunctionDeclarationNode> typedMethodNodes + ) { + } + private static TypeCheckSteps<TypedNativeTypeDeclarationNode> typeCheckStepsNativeTypeDeclaration( UntypedNativeTypeDeclarationNode untyped ) { @@ -1739,7 +1745,12 @@ public class TypeChecker { new Scope.NativeType(type) ); - context = context.addLexicalState(untyped.name(), typeOrConstructor); + var state = new TypeCheckNativeTypeDeclarationState( + typeOrConstructor, + List.of() + ); + + context = context.addLexicalState(untyped.name(), state); return context.declareVariableType( untyped.name(), @@ -1749,15 +1760,58 @@ public class TypeChecker { } @Override + public TypeCheckerContext declareFunctions(TypeCheckerContext context) { + var state = context.getLexicalState( + TypeCheckNativeTypeDeclarationState.class, + untyped.name() + ); + var typedMethodNodes = new ArrayList<TypedNativeFunctionDeclarationNode>(); + + for (var untypedMethodNode : untyped.methods()) { + context = context.enterBlock(P.map( + Map.entry( + "This", + Variable.defined( + Types.metaType(state.typeOrConstructor.toType()), + VariableType.VAL + ) + ) + )); + + var typeCheckSignatureResult = typeCheckFunctionType( + untypedMethodNode.signature(), + context + ); + var typedSignatureNode = typeCheckSignatureResult.value(); + context = typeCheckSignatureResult.context(); + + context = context.exit(); + + var typedMethodNode = new TypedNativeFunctionDeclarationNode( + untypedMethodNode.name(), + typedSignatureNode, + untypedMethodNode.source() + ); + typedMethodNodes.add(typedMethodNode); + } + + var newState = new TypeCheckNativeTypeDeclarationState( + state.typeOrConstructor, + typedMethodNodes + ); + return context.addLexicalState(untyped.name(), newState); + } + + @Override public TypeCheckerResult<TypedNativeTypeDeclarationNode> finish(TypeCheckerContext context) { - var typeOrConstructor = (TypeOrConstructor<SimpleNativeType>) context.getLexicalState( - TypeOrConstructor.class, + var state = context.getLexicalState( + TypeCheckNativeTypeDeclarationState.class, untyped.name() ); return context.toResult(new TypedNativeTypeDeclarationNode( - typeOrConstructor, - List.of(), + state.typeOrConstructor, + state.typedMethodNodes, untyped.source() )); } diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNativeTypeDeclarationTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNativeTypeDeclarationTests.java index c9dca725..938b6075 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNativeTypeDeclarationTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNativeTypeDeclarationTests.java @@ -2,14 +2,19 @@ package org.shedlang.compiler.typechecker; import org.junit.jupiter.api.Test; import org.shedlang.compiler.ast.untyped.Untyped; +import org.shedlang.compiler.ast.untyped.UntypedNativeFunctionDeclarationNode; import org.shedlang.compiler.ast.untyped.UntypedNativeTypeDeclarationNode; import org.shedlang.compiler.typechecker.errors.CannotDefineNativeTypeOutsideOfNamespaceError; +import org.shedlang.compiler.types.FunctionType; import org.shedlang.compiler.types.NamespaceName; import org.shedlang.compiler.types.Types; +import org.shedlang.compiler.util.P; import java.util.List; +import java.util.Map; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.shedlang.compiler.ast.typed.TypedNodeMatchers.isTypedNativeFunctionDeclarationNode; import static org.shedlang.compiler.ast.typed.TypedNodeMatchers.isTypedNativeTypeDeclarationNode; import static org.shedlang.compiler.typechecker.TypeCheckerTesting.typeCheckNamespaceStatement; import static org.shedlang.compiler.types.TypeMatchers.*; @@ -119,4 +124,37 @@ public class TypeCheckerNativeTypeDeclarationTests { )) ); } + + @Test + public void canTypeCheckMethodWithOnlyThisParam() { + var untyped = UntypedNativeTypeDeclarationNode.builder() + .withName("ExampleType") + .addMethod( + UntypedNativeFunctionDeclarationNode.builder() + .addPositionalParam(Untyped.typeLevelReference("This")) + .withName("a") + .withReturnType(Untyped.typeLevelReference("Unit")) + .build() + ) + .build(); + var context = TypeCheckerContext.EMPTY + .enterGlobal(P.map( + Map.entry("Unit", Types.metaType(Types.UNIT)) + )); + + var typed = typeCheckNamespaceStatement(untyped, context); + + assertThat( + typed.value(), + isTypedNativeTypeDeclarationNode() + .withMethods(isSequence( + isTypedNativeFunctionDeclarationNode() + .withSignature( + FunctionType.builder() + .addPositionalParam(Types.nativeType(NAMESPACE_NAME, "ExampleType")) + .build() + ) + )) + ); + } } |
