From f48ecd33ee4430abe7ebb85652554d37d8dea29b Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 3 Mar 2024 10:27:42 +0000 Subject: Check number of type-level arguments --- .../shedlang/compiler/typechecker/TypeChecker.java | 12 ++++++++++- .../errors/WrongNumberOfTypeLevelArgsError.java | 23 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/shedlang/compiler/typechecker/errors/WrongNumberOfTypeLevelArgsError.java (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 c51758bb..d9a52038 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java +++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java @@ -385,6 +385,7 @@ public class TypeChecker { var typeLevelArgs = typeCheckTypeLevelArgs( untypedTypeLevelArgNodes, typeConstructor.params(), + untyped.source(), contextForReceiver ); specificReceiverType = Types.metaType( @@ -397,6 +398,7 @@ public class TypeChecker { var typeLevelArgs = typeCheckTypeLevelArgs( untypedTypeLevelArgNodes, initialReceiverType.typeLevelParams().get(), + untyped.source(), contextForReceiver ); specificReceiverType = initialReceiverType.applyTypeLevelArgs(typeLevelArgs); @@ -1883,11 +1885,19 @@ public class TypeChecker { private static ArrayList typeCheckTypeLevelArgs( List untyped, List typeLevelParams, + Source source, TypeCheckerContext context ) { + if (untyped.size() != typeLevelParams.size()) { + throw new WrongNumberOfTypeLevelArgsError( + typeLevelParams.size(), + untyped.size(), + source + ); + } + var typeLevelArgs = new ArrayList(); - // TODO: check length // TODO: check arg is appropriate for param for (var paramIndex = 0; paramIndex < typeLevelParams.size(); paramIndex++) { diff --git a/src/main/java/org/shedlang/compiler/typechecker/errors/WrongNumberOfTypeLevelArgsError.java b/src/main/java/org/shedlang/compiler/typechecker/errors/WrongNumberOfTypeLevelArgsError.java new file mode 100644 index 00000000..9af86c37 --- /dev/null +++ b/src/main/java/org/shedlang/compiler/typechecker/errors/WrongNumberOfTypeLevelArgsError.java @@ -0,0 +1,23 @@ +package org.shedlang.compiler.typechecker.errors; + +import org.shedlang.compiler.errors.SourceError; +import org.shedlang.compiler.sources.Source; + +public class WrongNumberOfTypeLevelArgsError extends SourceError { + private final int expected; + private final int actual; + + public WrongNumberOfTypeLevelArgsError(int expected, int actual, Source source) { + super("Expected " + expected + " type-level arguments but got " + actual, source); + this.expected = expected; + this.actual = actual; + } + + public int expected() { + return expected; + } + + public int actual() { + return actual; + } +} -- cgit v1.2.3