From 9d0e6555d1058cd589a1935e33e78211d1514103 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 10 Jun 2023 09:30:28 +0100 Subject: Type check bool literals --- .../compiler/ast/typed/TypedNodeMatchers.java | 7 +++++++ .../org/shedlang/compiler/ast/untyped/Untyped.java | 4 ++++ .../typechecker/TypeCheckerBoolLiteralTests.java | 21 +++++++++++++++++++++ .../typechecker/TypeCheckerIntLiteralTests.java | 1 - 4 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 src/test/java/org/shedlang/compiler/typechecker/TypeCheckerBoolLiteralTests.java (limited to 'src/test/java') diff --git a/src/test/java/org/shedlang/compiler/ast/typed/TypedNodeMatchers.java b/src/test/java/org/shedlang/compiler/ast/typed/TypedNodeMatchers.java index 37f8e7f4..7716b76a 100644 --- a/src/test/java/org/shedlang/compiler/ast/typed/TypedNodeMatchers.java +++ b/src/test/java/org/shedlang/compiler/ast/typed/TypedNodeMatchers.java @@ -11,6 +11,13 @@ public class TypedNodeMatchers { private TypedNodeMatchers() { } + public static Matcher isTypedBoolLiteralNode(boolean value) { + return instanceOf( + TypedBoolLiteralNode.class, + has("value", x -> x.value(), equalTo(value)) + ); + } + public static Matcher isTypedIntLiteralNode(int value) { return isTypedIntLiteralNode(BigInteger.valueOf(value)); } diff --git a/src/test/java/org/shedlang/compiler/ast/untyped/Untyped.java b/src/test/java/org/shedlang/compiler/ast/untyped/Untyped.java index 7751bc05..37778968 100644 --- a/src/test/java/org/shedlang/compiler/ast/untyped/Untyped.java +++ b/src/test/java/org/shedlang/compiler/ast/untyped/Untyped.java @@ -8,6 +8,10 @@ public class Untyped { private Untyped() { } + public static UntypedBoolLiteralNode boolLiteral(boolean value) { + return new UntypedBoolLiteralNode(value, Sources.NULL); + } + public static UntypedIntLiteralNode intLiteral(int value) { return new UntypedIntLiteralNode(BigInteger.valueOf(value), Sources.NULL); } diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerBoolLiteralTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerBoolLiteralTests.java new file mode 100644 index 00000000..44258695 --- /dev/null +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerBoolLiteralTests.java @@ -0,0 +1,21 @@ +package org.shedlang.compiler.typechecker; + +import org.junit.jupiter.api.Test; +import org.shedlang.compiler.ast.untyped.Untyped; +import org.shedlang.compiler.types.Types; + +import static org.shedlang.compiler.ast.typed.TypedNodeMatchers.isTypedBoolLiteralNode; +import static org.zwobble.precisely.AssertThat.assertThat; +import static org.zwobble.precisely.Matchers.equalTo; + +public class TypeCheckerBoolLiteralTests { + @Test + public void BoolLiteralIsTypeCheckedAsBool() { + var untyped = Untyped.boolLiteral(true); + + var typed = TypeChecker.typeCheckExpression(untyped, TypeCheckerContext.EMPTY); + + assertThat(typed, isTypedBoolLiteralNode(true)); + assertThat(typed.type(), equalTo(Types.BOOL)); + } +} diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIntLiteralTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIntLiteralTests.java index 945c39f2..ca47b336 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIntLiteralTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIntLiteralTests.java @@ -5,7 +5,6 @@ import org.shedlang.compiler.ast.untyped.Untyped; import org.shedlang.compiler.types.Types; import static org.shedlang.compiler.ast.typed.TypedNodeMatchers.isTypedIntLiteralNode; -import static org.shedlang.compiler.ast.typed.TypedNodeMatchers.isTypedStringLiteralNode; import static org.zwobble.precisely.AssertThat.assertThat; import static org.zwobble.precisely.Matchers.equalTo; -- cgit v1.2.3