From 98e60278cd3e2dfffc4f5202de45518714d9402c Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 7 Jul 2023 18:43:53 +0100 Subject: Type check integer addition --- .../ast/untyped/UntypedBinaryOperationNode.java | 11 +++++++++++ .../ast/untyped/UntypedBinaryOperator.java | 5 +++++ .../ast/untyped/UntypedExpressionNode.java | 2 +- .../shedlang/compiler/typechecker/TypeChecker.java | 23 ++++++++++++++++++++++ 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/shedlang/compiler/ast/untyped/UntypedBinaryOperationNode.java create mode 100644 src/main/java/org/shedlang/compiler/ast/untyped/UntypedBinaryOperator.java (limited to 'src/main/java') diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedBinaryOperationNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedBinaryOperationNode.java new file mode 100644 index 00000000..c9ac56ad --- /dev/null +++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedBinaryOperationNode.java @@ -0,0 +1,11 @@ +package org.shedlang.compiler.ast.untyped; + +import org.shedlang.compiler.sources.Source; + +public record UntypedBinaryOperationNode( + UntypedBinaryOperator operator, + UntypedExpressionNode left, + UntypedExpressionNode right, + Source source +) implements UntypedExpressionNode { +} diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedBinaryOperator.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedBinaryOperator.java new file mode 100644 index 00000000..0a14b547 --- /dev/null +++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedBinaryOperator.java @@ -0,0 +1,5 @@ +package org.shedlang.compiler.ast.untyped; + +public enum UntypedBinaryOperator { + ADD +} diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedExpressionNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedExpressionNode.java index 10f3f010..cabf5876 100644 --- a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedExpressionNode.java +++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedExpressionNode.java @@ -1,5 +1,5 @@ package org.shedlang.compiler.ast.untyped; public sealed interface UntypedExpressionNode extends UntypedNode - permits UntypedBoolLiteralNode, UntypedCallNode, UntypedIntLiteralNode, UntypedReferenceNode, UntypedStringLiteralNode { + permits UntypedBinaryOperationNode, UntypedBoolLiteralNode, UntypedCallNode, UntypedIntLiteralNode, UntypedReferenceNode, UntypedStringLiteralNode { } diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java index 9aca796e..d3d0ef81 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java +++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java @@ -146,6 +146,26 @@ public class TypeChecker { return context.toResult(new TypedArgsNode(typedPositionalArgs, typedNamedArgs, args.source())); } + private static TypeCheckerResult typeCheckBinaryOperation( + UntypedBinaryOperationNode untyped, + TypeCheckerContext context + ) { + var leftResult = typeCheckExpression(untyped.left(), context); + var left = leftResult.value(); + context = leftResult.context(); + + var rightResult = typeCheckExpression(untyped.right(), context); + var right = rightResult.value(); + context = rightResult.context(); + + return context.toResult(new TypedBinaryOperationNode( + TypedBinaryOperator.INT_ADD, + left, + right, + untyped.source() + )); + } + public static TypeCheckerResult typeCheckBoolLiteral( UntypedBoolLiteralNode untyped, TypeCheckerContext context @@ -215,6 +235,9 @@ public class TypeChecker { TypeCheckerContext context ) { return switch (untyped) { + case UntypedBinaryOperationNode untypedBinaryOperation -> + typeCheckBinaryOperation(untypedBinaryOperation, context); + case UntypedBoolLiteralNode untypedBoolLiteral -> typeCheckBoolLiteral(untypedBoolLiteral, context); -- cgit v1.2.3