aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-10-25 22:03:34 +0100
committerMichael Williamson <mike@zwobble.org>2023-10-25 22:03:51 +0100
commit291f1463f2cf23689eb56d7a9bd577f18a949309 (patch)
treeb6e52082b8fd9b683b323fc2fca792c37e99b82c /src
parent6ce6049bbbfb609cb4d1acde3f4a5549aa3af9fc (diff)
Adding missing suffices to error types
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/EnvironmentBuilder.java6
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java10
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/errors/CannotDefineStructOutsideOfNamespaceError.java (renamed from src/main/java/org/shedlang/compiler/typechecker/errors/CannotDefineStructOutsideOfNamespace.java)4
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/errors/CannotDefineSumTypeOutsideOfNamespaceError.java (renamed from src/main/java/org/shedlang/compiler/typechecker/errors/CannotDefineSumTypeOutsideOfNamespace.java)4
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/errors/CannotReturnOutsideOfFunctionError.java (renamed from src/main/java/org/shedlang/compiler/typechecker/errors/CannotReturnOutsideOfFunction.java)4
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/errors/DuplicateVariableNameError.java (renamed from src/main/java/org/shedlang/compiler/typechecker/errors/DuplicateVariableName.java)4
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/errors/TargetTupleHasWrongElementCountError.java (renamed from src/main/java/org/shedlang/compiler/typechecker/errors/TargetTupleHasWrongElementCount.java)4
-rw-r--r--src/test/java/org/shedlang/compiler/typechecker/TypeCheckerAssignTests.java4
-rw-r--r--src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionDefinitionTests.java4
-rw-r--r--src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionReturnTests.java4
-rw-r--r--src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionTypeTests.java4
-rw-r--r--src/test/java/org/shedlang/compiler/typechecker/TypeCheckerStructDefinitionTests.java4
-rw-r--r--src/test/java/org/shedlang/compiler/typechecker/TypeCheckerSumTypeDefinitionTests.java4
-rw-r--r--src/test/java/org/shedlang/compiler/typechecker/TypeCheckerValTests.java4
14 files changed, 32 insertions, 32 deletions
diff --git a/src/main/java/org/shedlang/compiler/typechecker/EnvironmentBuilder.java b/src/main/java/org/shedlang/compiler/typechecker/EnvironmentBuilder.java
index 8e08855c..85292f8c 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/EnvironmentBuilder.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/EnvironmentBuilder.java
@@ -3,7 +3,7 @@ package org.shedlang.compiler.typechecker;
import org.pcollections.Empty;
import org.pcollections.PMap;
import org.shedlang.compiler.sources.Source;
-import org.shedlang.compiler.typechecker.errors.DuplicateVariableName;
+import org.shedlang.compiler.typechecker.errors.DuplicateVariableNameError;
import java.util.List;
@@ -30,14 +30,14 @@ public class EnvironmentBuilder {
public EnvironmentBuilder addUndefined(DeclaredVariable variable) {
if (environment.containsKey(variable.name())) {
- throw new DuplicateVariableName(variable.name(), variable.source());
+ throw new DuplicateVariableNameError(variable.name(), variable.source());
}
return new EnvironmentBuilder(environment.plus(variable.name(), Variable.undefined(variable.variableType())));
}
public EnvironmentBuilder add(String name, Variable variable, Source source) {
if (environment.containsKey(name)) {
- throw new DuplicateVariableName(name, source);
+ throw new DuplicateVariableNameError(name, source);
}
return new EnvironmentBuilder(environment.plus(name, variable));
}
diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
index d7ad4627..62216226 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
@@ -577,7 +577,7 @@ public class TypeChecker {
// This should be syntactically impossible, but since we only have
// one context type, we check for this possibility and throw a
// reasonable error.
- return new CannotReturnOutsideOfFunction(untyped.source());
+ return new CannotReturnOutsideOfFunctionError(untyped.source());
});
checkExpressionType(expression, expectedReturnType, context);
@@ -654,7 +654,7 @@ public class TypeChecker {
var seenParamNames = new HashSet<String>();
for (var untypedParamNode : untyped.params().named()) {
if (!seenParamNames.add(untypedParamNode.name())) {
- throw new DuplicateVariableName(
+ throw new DuplicateVariableNameError(
untypedParamNode.name(),
untypedParamNode.source()
);
@@ -950,7 +950,7 @@ public class TypeChecker {
@Override
public TypeCheckerContext declareTypes(TypeCheckerContext context) {
var namespaceName = context.namespaceName()
- .orElseThrow(() -> new CannotDefineStructOutsideOfNamespace(untyped.source()));
+ .orElseThrow(() -> new CannotDefineStructOutsideOfNamespaceError(untyped.source()));
var type = new StructType(namespaceName, untyped.name());
@@ -1005,7 +1005,7 @@ public class TypeChecker {
@Override
public TypeCheckerContext declareTypes(TypeCheckerContext context) {
var namespaceName = context.namespaceName()
- .orElseThrow(() -> new CannotDefineSumTypeOutsideOfNamespace(untyped.source()));
+ .orElseThrow(() -> new CannotDefineSumTypeOutsideOfNamespaceError(untyped.source()));
var type = new SumType(namespaceName, untyped.name());
@@ -1199,7 +1199,7 @@ public class TypeChecker {
}
if (targetTuple.elements().size() != tupleType.elements().size()) {
- throw new TargetTupleHasWrongElementCount(
+ throw new TargetTupleHasWrongElementCountError(
tupleType.elements().size(),
targetTuple.elements().size(),
targetTuple.source()
diff --git a/src/main/java/org/shedlang/compiler/typechecker/errors/CannotDefineStructOutsideOfNamespace.java b/src/main/java/org/shedlang/compiler/typechecker/errors/CannotDefineStructOutsideOfNamespaceError.java
index 6e8810eb..2ac8a386 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/errors/CannotDefineStructOutsideOfNamespace.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/errors/CannotDefineStructOutsideOfNamespaceError.java
@@ -3,8 +3,8 @@ package org.shedlang.compiler.typechecker.errors;
import org.shedlang.compiler.errors.InternalCompilerError;
import org.shedlang.compiler.sources.Source;
-public class CannotDefineStructOutsideOfNamespace extends InternalCompilerError {
- public CannotDefineStructOutsideOfNamespace(Source source) {
+public class CannotDefineStructOutsideOfNamespaceError extends InternalCompilerError {
+ public CannotDefineStructOutsideOfNamespaceError(Source source) {
super("Cannot define struct outside of namespace", source);
}
}
diff --git a/src/main/java/org/shedlang/compiler/typechecker/errors/CannotDefineSumTypeOutsideOfNamespace.java b/src/main/java/org/shedlang/compiler/typechecker/errors/CannotDefineSumTypeOutsideOfNamespaceError.java
index d3f9c48c..5d5505e1 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/errors/CannotDefineSumTypeOutsideOfNamespace.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/errors/CannotDefineSumTypeOutsideOfNamespaceError.java
@@ -3,8 +3,8 @@ package org.shedlang.compiler.typechecker.errors;
import org.shedlang.compiler.errors.InternalCompilerError;
import org.shedlang.compiler.sources.Source;
-public class CannotDefineSumTypeOutsideOfNamespace extends InternalCompilerError {
- public CannotDefineSumTypeOutsideOfNamespace(Source source) {
+public class CannotDefineSumTypeOutsideOfNamespaceError extends InternalCompilerError {
+ public CannotDefineSumTypeOutsideOfNamespaceError(Source source) {
super("Cannot define sum type outside of namespace", source);
}
}
diff --git a/src/main/java/org/shedlang/compiler/typechecker/errors/CannotReturnOutsideOfFunction.java b/src/main/java/org/shedlang/compiler/typechecker/errors/CannotReturnOutsideOfFunctionError.java
index 8b4a3c18..b3ce6eb4 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/errors/CannotReturnOutsideOfFunction.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/errors/CannotReturnOutsideOfFunctionError.java
@@ -3,8 +3,8 @@ package org.shedlang.compiler.typechecker.errors;
import org.shedlang.compiler.errors.SourceError;
import org.shedlang.compiler.sources.Source;
-public class CannotReturnOutsideOfFunction extends SourceError {
- public CannotReturnOutsideOfFunction(Source source) {
+public class CannotReturnOutsideOfFunctionError extends SourceError {
+ public CannotReturnOutsideOfFunctionError(Source source) {
super("Cannot return outside of function", source);
}
}
diff --git a/src/main/java/org/shedlang/compiler/typechecker/errors/DuplicateVariableName.java b/src/main/java/org/shedlang/compiler/typechecker/errors/DuplicateVariableNameError.java
index 21771987..b21e1d98 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/errors/DuplicateVariableName.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/errors/DuplicateVariableNameError.java
@@ -3,10 +3,10 @@ package org.shedlang.compiler.typechecker.errors;
import org.shedlang.compiler.errors.SourceError;
import org.shedlang.compiler.sources.Source;
-public class DuplicateVariableName extends SourceError {
+public class DuplicateVariableNameError extends SourceError {
private final String variableName;
- public DuplicateVariableName(String variableName, Source source) {
+ public DuplicateVariableNameError(String variableName, Source source) {
super("Duplicate variable name: " + variableName, source);
this.variableName = variableName;
}
diff --git a/src/main/java/org/shedlang/compiler/typechecker/errors/TargetTupleHasWrongElementCount.java b/src/main/java/org/shedlang/compiler/typechecker/errors/TargetTupleHasWrongElementCountError.java
index da2d6ba9..48296e20 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/errors/TargetTupleHasWrongElementCount.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/errors/TargetTupleHasWrongElementCountError.java
@@ -3,11 +3,11 @@ package org.shedlang.compiler.typechecker.errors;
import org.shedlang.compiler.errors.SourceError;
import org.shedlang.compiler.sources.Source;
-public class TargetTupleHasWrongElementCount extends SourceError {
+public class TargetTupleHasWrongElementCountError extends SourceError {
private final int expression;
private final int target;
- public TargetTupleHasWrongElementCount(int expression, int target, Source source) {
+ public TargetTupleHasWrongElementCountError(int expression, int target, Source source) {
super("Expression has " + expression + " elements, but target has " + target + " elements", source);
this.expression = expression;
this.target = target;
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)
);