From 4c039cf9f072e670df8f9a070c4ae80c23067ba5 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 11 Feb 2025 19:16:19 +0000 Subject: Return context when type checking type level expressions --- .../typechecker/TypeCheckerConstructedTypeTests.java | 4 ++-- .../TypeCheckerFunctionSignatureTests.java | 20 ++++++++++---------- .../typechecker/TypeCheckerFunctionTypeTests.java | 20 ++++++++++---------- .../typechecker/TypeCheckerTupleTypeTests.java | 4 ++-- .../TypeCheckerTypeLevelReferenceTests.java | 4 ++-- 5 files changed, 26 insertions(+), 26 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerConstructedTypeTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerConstructedTypeTests.java index 80c7e82d..eb8f4f2b 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerConstructedTypeTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerConstructedTypeTests.java @@ -41,9 +41,9 @@ public class TypeCheckerConstructedTypeTests { Map.entry("Bool", Types.metaType(Types.BOOL)) )); - var typed = TypeChecker.typeCheckTypeExpression(untyped, context); + var result = TypeChecker.typeCheckTypeExpression(untyped, context); - assertThat(typed, isTypedConstructedTypeNode(isConstructedType( + assertThat(result.value(), isTypedConstructedTypeNode(isConstructedType( equalTo(typeConstructor), isSequence(equalTo(Types.INT), equalTo(Types.BOOL)) ))); diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionSignatureTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionSignatureTests.java index 91d66f0a..cdd77ae7 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionSignatureTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionSignatureTests.java @@ -24,10 +24,10 @@ public class TypeCheckerFunctionSignatureTests { var context = TypeCheckerContext.EMPTY .enterGlobal(P.map(Map.entry("Unit", Types.metaType(Types.UNIT)))); - var typed = typeCheckFunctionSignature(untyped, Optional.empty(), context); + var result = typeCheckFunctionSignature(untyped, Optional.empty(), context); assertThat( - typed, + result.value(), isTypedFunctionSignatureNode() .withParams(isTypedParamsNode(isSequence(), isSequence())) .withEffect(isOptionalEmpty()) @@ -49,10 +49,10 @@ public class TypeCheckerFunctionSignatureTests { Map.entry("Unit", Types.metaType(Types.UNIT)) )); - var typed = typeCheckFunctionSignature(untyped, Optional.empty(), context); + var result = typeCheckFunctionSignature(untyped, Optional.empty(), context); assertThat( - typed, + result.value(), isTypedFunctionSignatureNode() .withParams( isTypedParamsNode( @@ -85,10 +85,10 @@ public class TypeCheckerFunctionSignatureTests { Map.entry("Unit", Types.metaType(Types.UNIT)) )); - var typed = typeCheckFunctionSignature(untyped, Optional.empty(), context); + var result = typeCheckFunctionSignature(untyped, Optional.empty(), context); assertThat( - typed, + result.value(), isTypedFunctionSignatureNode() .withEffect(isOptionalOf(isTypedTypeLevelReferenceNode("Io", Effects.IO))) ); @@ -105,14 +105,14 @@ public class TypeCheckerFunctionSignatureTests { var context = TypeCheckerContext.EMPTY .enterNamespace(namespaceName, P.map()); - var typed = typeCheckFunctionSignature( + var result = typeCheckFunctionSignature( untyped, Optional.of(new Scope.Function(namespaceName, "f")), context ); assertThat( - typed, + result.value(), isTypedFunctionSignatureNode() .withTypeLevelParams(isOptionalOf(isSequence( equalTo(TypeParam.forFunction( @@ -136,14 +136,14 @@ public class TypeCheckerFunctionSignatureTests { var context = TypeCheckerContext.EMPTY .enterNamespace(namespaceName, P.map()); - var typed = typeCheckFunctionSignature( + var result = typeCheckFunctionSignature( untyped, Optional.of(new Scope.Function(namespaceName, "f")), context ); assertThat( - typed, + result.value(), isTypedFunctionSignatureNode() .withParams( isTypedParamsNode( diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionTypeTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionTypeTests.java index 86e1b048..f4a2a6a2 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionTypeTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionTypeTests.java @@ -28,10 +28,10 @@ public class TypeCheckerFunctionTypeTests { Map.entry("String", Types.metaType(Types.STRING)) )); - var typed = TypeChecker.typeCheckTypeLevelExpression(TypeSets.META_TYPE, untyped, context); + var result = TypeChecker.typeCheckTypeLevelExpression(TypeSets.META_TYPE, untyped, context); assertThat( - typed, + result.value(), isTypedFunctionTypeNode(equalTo( FunctionType.builder() .withReturnType(Types.STRING) @@ -50,10 +50,10 @@ public class TypeCheckerFunctionTypeTests { Map.entry("String", Types.metaType(Types.STRING)) )); - var typed = TypeChecker.typeCheckTypeLevelExpression(TypeSets.META_TYPE, untyped, context); + var result = TypeChecker.typeCheckTypeLevelExpression(TypeSets.META_TYPE, untyped, context); assertThat( - typed, + result.value(), isTypedFunctionTypeNode(equalTo( FunctionType.builder() .withEffect(Effects.NONE) @@ -75,10 +75,10 @@ public class TypeCheckerFunctionTypeTests { Map.entry("String", Types.metaType(Types.STRING)) )); - var typed = TypeChecker.typeCheckTypeLevelExpression(TypeSets.META_TYPE, untyped, context); + var result = TypeChecker.typeCheckTypeLevelExpression(TypeSets.META_TYPE, untyped, context); assertThat( - typed, + result.value(), isTypedFunctionTypeNode(equalTo( FunctionType.builder() .withEffect(Effects.IO) @@ -102,10 +102,10 @@ public class TypeCheckerFunctionTypeTests { Map.entry("String", Types.metaType(Types.STRING)) )); - var typed = TypeChecker.typeCheckTypeLevelExpression(TypeSets.META_TYPE, untyped, context); + var result = TypeChecker.typeCheckTypeLevelExpression(TypeSets.META_TYPE, untyped, context); assertThat( - typed, + result.value(), isTypedFunctionTypeNode(equalTo( FunctionType.builder() .addPositionalParam(Types.INT) @@ -130,10 +130,10 @@ public class TypeCheckerFunctionTypeTests { Map.entry("String", Types.metaType(Types.STRING)) )); - var typed = TypeChecker.typeCheckTypeLevelExpression(TypeSets.META_TYPE, untyped, context); + var result = TypeChecker.typeCheckTypeLevelExpression(TypeSets.META_TYPE, untyped, context); assertThat( - typed, + result.value(), isTypedFunctionTypeNode(equalTo( FunctionType.builder() .addNamedParam("a", Types.INT) diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTupleTypeTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTupleTypeTests.java index b6fcdf84..f4cd4e74 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTupleTypeTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTupleTypeTests.java @@ -31,9 +31,9 @@ public class TypeCheckerTupleTypeTests { Map.entry("String", Types.metaType(Types.STRING)) )); - var typed = TypeChecker.typeCheckTypeLevelExpression(TypeSets.META_TYPE, untyped, context); + var result = TypeChecker.typeCheckTypeLevelExpression(TypeSets.META_TYPE, untyped, context); - assertThat(typed, isTypedTupleTypeNode(equalTo(Types.tuple(List.of( + assertThat(result.value(), isTypedTupleTypeNode(equalTo(Types.tuple(List.of( Types.BOOL, Types.INT, Types.STRING diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTypeLevelReferenceTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTypeLevelReferenceTests.java index ac3cbeb8..fcd3b558 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTypeLevelReferenceTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTypeLevelReferenceTests.java @@ -23,9 +23,9 @@ public class TypeCheckerTypeLevelReferenceTests { var context = TypeCheckerContext.EMPTY .enterGlobal(P.map(Map.entry("String", Types.metaType(Types.STRING)))); - var typed = TypeChecker.typeCheckTypeLevelExpression(TypeSets.META_TYPE, untyped, context); + var result = TypeChecker.typeCheckTypeLevelExpression(TypeSets.META_TYPE, untyped, context); - assertThat(typed, isTypedTypeLevelReferenceNode("String", Types.STRING)); + assertThat(result.value(), isTypedTypeLevelReferenceNode("String", Types.STRING)); } @Test -- cgit v1.2.3