aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-07-03 12:11:20 +0100
committerMichael Williamson <mike@zwobble.org>2023-07-03 12:11:20 +0100
commit9a79e487595ac1fdbf4e9c69963440bd979aa107 (patch)
tree91e3099883de790e126d390672afb2085748b7c6 /src
parent79886c47c164aafb25c533ecc20cb93554fa2c08 (diff)
Define val type
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java10
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java14
-rw-r--r--src/test/java/org/shedlang/compiler/ast/typed/TypedNodeMatchers.java4
-rw-r--r--src/test/java/org/shedlang/compiler/typechecker/TypeCheckerValTests.java30
4 files changed, 53 insertions, 5 deletions
diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
index 228f1fa0..1dd4b118 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
@@ -403,7 +403,7 @@ public class TypeChecker {
var expression = expressionResult.value();
context = expressionResult.context();
- var targetResult = typeCheckTarget(val.target(), context);
+ var targetResult = typeCheckTarget(val.target(), expression.type(), context);
var target = targetResult.value();
context = targetResult.context();
@@ -412,11 +412,15 @@ public class TypeChecker {
private static TypeCheckerResult<TypedTargetNode> typeCheckTarget(
UntypedTargetNode target,
+ Type expressionType,
TypeCheckerContext context
) {
return switch (target) {
- case UntypedTargetNode.Variable variable ->
- context.toResult(new TypedTargetNode.Variable(variable.name(), target.source()));
+ case UntypedTargetNode.Variable variable -> {
+ context = context.define(variable.name(), expressionType);
+
+ yield context.toResult(new TypedTargetNode.Variable(variable.name(), target.source()));
+ }
};
}
}
diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java b/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java
index 71a02101..2cf99f9f 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java
@@ -71,6 +71,20 @@ public class TypeCheckerContext {
return Optional.ofNullable(environment.get(name));
}
+ public TypeCheckerContext define(
+ String name,
+ Type type
+ ) {
+ // TODO: check if already defined
+ return new TypeCheckerContext(
+ this.environment.plus(name, type),
+ this.effect,
+ this.boundVariables,
+ this.freeVariables,
+ this.namespaceTypeInfo
+ );
+ }
+
public Effect effect() {
return effect;
}
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 48c67ad1..ccda182a 100644
--- a/src/test/java/org/shedlang/compiler/ast/typed/TypedNodeMatchers.java
+++ b/src/test/java/org/shedlang/compiler/ast/typed/TypedNodeMatchers.java
@@ -125,8 +125,8 @@ public class TypedNodeMatchers {
}
public static Matcher<TypedFunctionStatementNode> isTypedValNode(
- Matcher<TypedTargetNode> target,
- Matcher<TypedExpressionNode> expression
+ Matcher<? super TypedTargetNode> target,
+ Matcher<? super TypedExpressionNode> expression
) {
return instanceOf(
TypedValNode.class,
diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerValTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerValTests.java
index ec1e3c8a..8ebe4f79 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerValTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerValTests.java
@@ -2,9 +2,16 @@ package org.shedlang.compiler.typechecker;
import org.junit.jupiter.api.Test;
import org.shedlang.compiler.ast.untyped.Untyped;
+import org.shedlang.compiler.ast.untyped.UntypedFunctionDefinitionNode;
+import org.shedlang.compiler.types.Types;
+import org.shedlang.compiler.util.P;
+
+import java.util.Map;
import static org.shedlang.compiler.ast.typed.TypedNodeMatchers.*;
import static org.zwobble.precisely.AssertThat.assertThat;
+import static org.zwobble.precisely.Matchers.anything;
+import static org.zwobble.precisely.Matchers.isSequence;
public class TypeCheckerValTests {
@Test
@@ -18,4 +25,27 @@ public class TypeCheckerValTests {
isTypedStringLiteralNode("hello")
));
}
+
+ @Test
+ public void valCanBeReferencedAfterDefinition() {
+ var untyped = UntypedFunctionDefinitionNode.builder()
+ .addStatement(Untyped.val(Untyped.targetVariable("x"), Untyped.stringLiteral("hello")))
+ .addStatement(Untyped.expressionStatement(Untyped.reference("x")))
+ .build();
+ var context = TypeCheckerContext.EMPTY
+ .enterBlock(P.map(
+ Map.entry("Unit", Types.metaType(Types.UNIT))
+ ));
+
+ var typed = TypeChecker.typeCheckNamespaceStatement(untyped, context);
+
+ assertThat(
+ typed,
+ isTypedFunctionDefinitionNode()
+ .withBody(isSequence(
+ isTypedValNode(anything(), anything()),
+ isTypedExpressionStatementNode(isTypedReferenceNode("x", Types.STRING))
+ ))
+ );
+ }
}