From 291f1463f2cf23689eb56d7a9bd577f18a949309 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Wed, 25 Oct 2023 22:03:34 +0100 Subject: Adding missing suffices to error types --- .../org/shedlang/compiler/typechecker/TypeCheckerAssignTests.java | 4 ++-- .../compiler/typechecker/TypeCheckerFunctionDefinitionTests.java | 4 ++-- .../shedlang/compiler/typechecker/TypeCheckerFunctionReturnTests.java | 4 ++-- .../shedlang/compiler/typechecker/TypeCheckerFunctionTypeTests.java | 4 ++-- .../compiler/typechecker/TypeCheckerStructDefinitionTests.java | 4 ++-- .../compiler/typechecker/TypeCheckerSumTypeDefinitionTests.java | 4 ++-- .../java/org/shedlang/compiler/typechecker/TypeCheckerValTests.java | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerAssignTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerAssignTests.java index ff2e3f1d..6c3cf09d 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerAssignTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerAssignTests.java @@ -5,7 +5,7 @@ import org.shedlang.compiler.ast.typed.TypedFunctionStatementNode; import org.shedlang.compiler.ast.untyped.Untyped; import org.shedlang.compiler.ast.untyped.UntypedFunctionStatementNode; import org.shedlang.compiler.typechecker.errors.CanOnlyAssignToVarError; -import org.shedlang.compiler.typechecker.errors.TargetTupleHasWrongElementCount; +import org.shedlang.compiler.typechecker.errors.TargetTupleHasWrongElementCountError; import org.shedlang.compiler.typechecker.errors.UnexpectedTypeError; import org.shedlang.compiler.typechecker.typesets.TypeSets; import org.shedlang.compiler.types.NamespaceName; @@ -156,7 +156,7 @@ public class TypeCheckerAssignTests { )); var error = assertThrows( - TargetTupleHasWrongElementCount.class, + TargetTupleHasWrongElementCountError.class, () -> typeCheckFunctionStatement(untyped, context) ); diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionDefinitionTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionDefinitionTests.java index 3354f0bf..12213ba9 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionDefinitionTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionDefinitionTests.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; import org.shedlang.compiler.ast.untyped.Untyped; import org.shedlang.compiler.ast.untyped.UntypedCallNode; import org.shedlang.compiler.ast.untyped.UntypedFunctionDefinitionNode; -import org.shedlang.compiler.typechecker.errors.DuplicateVariableName; +import org.shedlang.compiler.typechecker.errors.DuplicateVariableNameError; import org.shedlang.compiler.typechecker.errors.UnexpectedTypeError; import org.shedlang.compiler.typechecker.typesets.TypeSets; import org.shedlang.compiler.types.Effects; @@ -61,7 +61,7 @@ public class TypeCheckerFunctionDefinitionTests { )); var error = assertThrows( - DuplicateVariableName.class, + DuplicateVariableNameError.class, () -> typeCheckNamespaceStatement(untyped, context) ); diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionReturnTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionReturnTests.java index 2a8ae446..a8ab9cb1 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionReturnTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionReturnTests.java @@ -2,7 +2,7 @@ package org.shedlang.compiler.typechecker; import org.junit.jupiter.api.Test; import org.shedlang.compiler.ast.untyped.Untyped; -import org.shedlang.compiler.typechecker.errors.CannotReturnOutsideOfFunction; +import org.shedlang.compiler.typechecker.errors.CannotReturnOutsideOfFunctionError; import org.shedlang.compiler.typechecker.errors.UnexpectedTypeError; import org.shedlang.compiler.typechecker.typesets.TypeSets; import org.shedlang.compiler.types.Effects; @@ -34,7 +34,7 @@ public class TypeCheckerFunctionReturnTests { .enterNamespace(NamespaceName.of("Example"), P.map()); assertThrows( - CannotReturnOutsideOfFunction.class, + CannotReturnOutsideOfFunctionError.class, () -> TypeChecker.typeCheckFunctionStatement(untyped, context) ); } diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionTypeTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionTypeTests.java index 12022314..86e1b048 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionTypeTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionTypeTests.java @@ -3,7 +3,7 @@ package org.shedlang.compiler.typechecker; import org.junit.jupiter.api.Test; import org.shedlang.compiler.ast.untyped.Untyped; import org.shedlang.compiler.ast.untyped.UntypedFunctionTypeNode; -import org.shedlang.compiler.typechecker.errors.DuplicateVariableName; +import org.shedlang.compiler.typechecker.errors.DuplicateVariableNameError; import org.shedlang.compiler.typechecker.typesets.TypeSets; import org.shedlang.compiler.types.Effects; import org.shedlang.compiler.types.FunctionType; @@ -159,7 +159,7 @@ public class TypeCheckerFunctionTypeTests { )); var error = assertThrows( - DuplicateVariableName.class, + DuplicateVariableNameError.class, () -> TypeChecker.typeCheckTypeLevelExpression(TypeSets.META_TYPE, untyped, context) ); diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerStructDefinitionTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerStructDefinitionTests.java index 344cfa66..292d9ab9 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerStructDefinitionTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerStructDefinitionTests.java @@ -3,7 +3,7 @@ package org.shedlang.compiler.typechecker; import org.junit.jupiter.api.Test; import org.shedlang.compiler.ast.untyped.Untyped; import org.shedlang.compiler.ast.untyped.UntypedStructDefinitionNode; -import org.shedlang.compiler.typechecker.errors.CannotDefineStructOutsideOfNamespace; +import org.shedlang.compiler.typechecker.errors.CannotDefineStructOutsideOfNamespaceError; import org.shedlang.compiler.types.NamespaceName; import org.shedlang.compiler.types.Types; import org.shedlang.compiler.util.P; @@ -28,7 +28,7 @@ public class TypeCheckerStructDefinitionTests { var context = TypeCheckerContext.EMPTY; assertThrows( - CannotDefineStructOutsideOfNamespace.class, + CannotDefineStructOutsideOfNamespaceError.class, () -> TypeChecker.typeCheckStepsNamespaceStatement(untyped).typeCheckAllPhases(context) ); } diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerSumTypeDefinitionTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerSumTypeDefinitionTests.java index ac96ca3d..562e24e0 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerSumTypeDefinitionTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerSumTypeDefinitionTests.java @@ -3,7 +3,7 @@ package org.shedlang.compiler.typechecker; import org.junit.jupiter.api.Test; import org.shedlang.compiler.ast.untyped.Untyped; import org.shedlang.compiler.ast.untyped.UntypedSumTypeDefinitionNode; -import org.shedlang.compiler.typechecker.errors.CannotDefineSumTypeOutsideOfNamespace; +import org.shedlang.compiler.typechecker.errors.CannotDefineSumTypeOutsideOfNamespaceError; import org.shedlang.compiler.typechecker.errors.VariantTypeIsNotStructError; import org.shedlang.compiler.types.NamespaceName; import org.shedlang.compiler.types.Types; @@ -28,7 +28,7 @@ public class TypeCheckerSumTypeDefinitionTests { var context = TypeCheckerContext.EMPTY; assertThrows( - CannotDefineSumTypeOutsideOfNamespace.class, + CannotDefineSumTypeOutsideOfNamespaceError.class, () -> TypeChecker.typeCheckStepsNamespaceStatement(untyped).typeCheckAllPhases(context) ); } diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerValTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerValTests.java index 2688a4c1..7ff435a2 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerValTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerValTests.java @@ -6,7 +6,7 @@ import org.shedlang.compiler.ast.untyped.Untyped; import org.shedlang.compiler.ast.untyped.UntypedFunctionDefinitionNode; import org.shedlang.compiler.ast.untyped.UntypedFunctionStatementNode; import org.shedlang.compiler.ast.untyped.UntypedNamespaceNode; -import org.shedlang.compiler.typechecker.errors.DuplicateVariableName; +import org.shedlang.compiler.typechecker.errors.DuplicateVariableNameError; import org.shedlang.compiler.typechecker.errors.ReferenceBeforeDefinitionError; import org.shedlang.compiler.types.NamespaceName; import org.shedlang.compiler.types.Types; @@ -142,7 +142,7 @@ public class TypeCheckerValTests { )); var error = assertThrows( - DuplicateVariableName.class, + DuplicateVariableNameError.class, () -> typeCheckNamespaceStatement(untyped, context) ); -- cgit v1.2.3