From 1f73c6fcd01e6c3b3c0e7ca0b30fb46de56f0b59 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 2 Mar 2025 19:52:06 +0000 Subject: Add native type type params to environment --- .../shedlang/compiler/typechecker/TypeChecker.java | 22 ++++---- .../TypeCheckerNativeTypeDeclarationTests.java | 59 ++++++++++++++++++++++ 2 files changed, 72 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java index aaf49ba0..72404d42 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java +++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java @@ -1779,15 +1779,19 @@ public class TypeChecker { }; for (var untypedMethodNode : untyped.methods()) { - context = context.enterBlock(P.map( - Map.entry( - "This", - Variable.defined( - Types.metaType(thisType), - VariableType.VAL - ) - ) - )); + var environment = environmentForTypeOrConstructor(typeOrConstructor); + // TODO: push This into environmentForTypeOrConstructor? + // Probably not (confusing for sum types), but might still + // be useful for method definitions. + environment = environment.add( + "This", + Variable.defined( + Types.metaType(thisType), + VariableType.VAL + ), + untyped.source() + ); + context = context.enterBlock(environment.build()); var typeCheckSignatureResult = typeCheckFunctionType( untypedMethodNode.signature(), diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNativeTypeDeclarationTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNativeTypeDeclarationTests.java index 562b7ab4..024773c8 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNativeTypeDeclarationTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNativeTypeDeclarationTests.java @@ -281,4 +281,63 @@ public class TypeCheckerNativeTypeDeclarationTests { )) ); } + + @Test + public void whenNativeTypeIsGenericThenTypeParamsCanBeUsedInNativeMethodDeclarations() { + var untyped = UntypedNativeTypeDeclarationNode.builder() + .withName("ExampleType") + .withTypeLevelParams(List.of(Untyped.typeParam("T"))) + .addMethod( + UntypedNativeFunctionDeclarationNode.builder() + .withName("a") + .addPositionalParam(Untyped.typeLevelReference("This")) + .addPositionalParam(Untyped.typeLevelReference("T")) + .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.constructedType( + Types.typeConstructor( + List.of( + TypeParam.forNativeType(Types.nativeType(NAMESPACE_NAME, "ExampleType"), "T") + ), + Types.nativeType(NAMESPACE_NAME, "ExampleType") + ), + List.of(TypeParam.forNativeType(Types.nativeType(NAMESPACE_NAME, "ExampleType"), "T")) + )) + .addPositionalParam(TypeParam.forNativeType(Types.nativeType(NAMESPACE_NAME, "ExampleType"), "T")) + .build() + ) + )) + ); + var nativeTypeInfo = typed.context().toTypeInfos() + .nativeTypeInfo(Types.nativeType(NAMESPACE_NAME, "ExampleType")) + .orElseThrow(); + assertThat( + nativeTypeInfo, + has("methods", x -> x.methods(), isSequence( + equalTo(new MethodInfo( + "a", + FunctionType.builder() + .addPositionalParam(TypeParam.forNativeType(Types.nativeType(NAMESPACE_NAME, "ExampleType"), "T")) + .withReturnType(Types.UNIT) + .build() + )) + )) + ); + } } -- cgit v1.2.3