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 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'src/main/java') 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(), -- cgit v1.2.3