aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-10-21 13:23:09 +0100
committerMichael Williamson <mike@zwobble.org>2023-10-21 13:23:09 +0100
commitf56afdfe4c659ac3ea3cd5f11b84455c5e424063 (patch)
tree4ac6317a4ba9e06457a4705bc3d3bdc58ea5faab /src
parentb1313781607516060ce36fe676eaed521fbe75d2 (diff)
Add imports to typed namespace node
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/shedlang/compiler/ast/typed/TypedImportNode.java10
-rw-r--r--src/main/java/org/shedlang/compiler/ast/typed/TypedNamespaceNode.java1
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java6
-rw-r--r--src/test/java/org/shedlang/compiler/ast/typed/Typed.java9
-rw-r--r--src/test/java/org/shedlang/compiler/ast/typed/TypedNamespaceNodeMatcher.java7
-rw-r--r--src/test/java/org/shedlang/compiler/ast/typed/TypedNodeMatchers.java11
-rw-r--r--src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNamespaceTests.java21
7 files changed, 60 insertions, 5 deletions
diff --git a/src/main/java/org/shedlang/compiler/ast/typed/TypedImportNode.java b/src/main/java/org/shedlang/compiler/ast/typed/TypedImportNode.java
new file mode 100644
index 00000000..e9932300
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/ast/typed/TypedImportNode.java
@@ -0,0 +1,10 @@
+package org.shedlang.compiler.ast.typed;
+
+import org.shedlang.compiler.sources.Source;
+import org.shedlang.compiler.types.NamespaceName;
+
+public record TypedImportNode(
+ NamespaceName namespaceName,
+ Source source
+) implements TypedNode {
+}
diff --git a/src/main/java/org/shedlang/compiler/ast/typed/TypedNamespaceNode.java b/src/main/java/org/shedlang/compiler/ast/typed/TypedNamespaceNode.java
index 628cffd2..26da9e61 100644
--- a/src/main/java/org/shedlang/compiler/ast/typed/TypedNamespaceNode.java
+++ b/src/main/java/org/shedlang/compiler/ast/typed/TypedNamespaceNode.java
@@ -7,6 +7,7 @@ import java.util.List;
public record TypedNamespaceNode(
NamespaceName namespaceName,
+ List<TypedImportNode> imports,
List<TypedNamespaceStatementNode> body,
List<String> boundVariableNames,
List<String> fieldNames,
diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
index cc68861a..f2844b33 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
@@ -686,12 +686,17 @@ public class TypeChecker {
) {
var namespaceEnvironment = EnvironmentBuilder.EMPTY;
+ var typedImportNodes = new ArrayList<TypedImportNode>();
for (var import_ : untyped.imports()) {
namespaceEnvironment = namespaceEnvironment.add(
import_.namespaceName().parts().getLast(),
Variable.defined(new NamespaceType(import_.namespaceName()), VariableType.IMPORT),
import_.source()
);
+ typedImportNodes.add(new TypedImportNode(
+ import_.namespaceName(),
+ import_.source()
+ ));
}
for (var statement : untyped.body()) {
@@ -805,6 +810,7 @@ public class TypeChecker {
var typed = new TypedNamespaceNode(
untyped.namespaceName(),
+ typedImportNodes,
typedBody,
declaredVariables.stream()
.map(boundVariable -> boundVariable.name())
diff --git a/src/test/java/org/shedlang/compiler/ast/typed/Typed.java b/src/test/java/org/shedlang/compiler/ast/typed/Typed.java
index 7c5aa0fc..057e6062 100644
--- a/src/test/java/org/shedlang/compiler/ast/typed/Typed.java
+++ b/src/test/java/org/shedlang/compiler/ast/typed/Typed.java
@@ -163,7 +163,14 @@ public class Typed {
List<String> boundVariableNames,
List<String> fieldNames
) {
- return new TypedNamespaceNode(namespaceName, body, boundVariableNames, fieldNames, Sources.NULL);
+ return new TypedNamespaceNode(
+ namespaceName,
+ List.of(),
+ body,
+ boundVariableNames,
+ fieldNames,
+ Sources.NULL
+ );
}
public static TypedStringLiteralNode stringLiteral(String value) {
diff --git a/src/test/java/org/shedlang/compiler/ast/typed/TypedNamespaceNodeMatcher.java b/src/test/java/org/shedlang/compiler/ast/typed/TypedNamespaceNodeMatcher.java
index 0d7ecf83..f8ee5c8e 100644
--- a/src/test/java/org/shedlang/compiler/ast/typed/TypedNamespaceNodeMatcher.java
+++ b/src/test/java/org/shedlang/compiler/ast/typed/TypedNamespaceNodeMatcher.java
@@ -34,6 +34,13 @@ public class TypedNamespaceNodeMatcher implements Matcher<TypedNamespaceNode> {
return allOf(submatchers);
}
+ public TypedNamespaceNodeMatcher withImports(
+ Matcher<Iterable<? extends TypedImportNode>> imports
+ ) {
+ return new TypedNamespaceNodeMatcher(
+ submatchers.plus(has("imports", x -> x.imports(), imports))
+ );
+ }
public TypedNamespaceNodeMatcher withBody(
Matcher<Iterable<? extends TypedNamespaceStatementNode>> body
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 1fe83958..dde00bca 100644
--- a/src/test/java/org/shedlang/compiler/ast/typed/TypedNodeMatchers.java
+++ b/src/test/java/org/shedlang/compiler/ast/typed/TypedNodeMatchers.java
@@ -1,9 +1,6 @@
package org.shedlang.compiler.ast.typed;
-import org.shedlang.compiler.types.SumType;
-import org.shedlang.compiler.types.TupleType;
-import org.shedlang.compiler.types.Type;
-import org.shedlang.compiler.types.TypeLevelValue;
+import org.shedlang.compiler.types.*;
import org.zwobble.precisely.Matcher;
import java.math.BigInteger;
@@ -139,6 +136,12 @@ public class TypedNodeMatchers {
);
}
+ public static Matcher<TypedImportNode> isTypedImportNode(
+ NamespaceName namespaceName
+ ) {
+ return has("namespaceName", x -> x.namespaceName(), equalTo(namespaceName));
+ }
+
public static Matcher<TypedExpressionNode> isTypedIntAddNode(
Matcher<TypedExpressionNode> left,
Matcher<TypedExpressionNode> right
diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNamespaceTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNamespaceTests.java
index 508bf6cd..a0fdd837 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNamespaceTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNamespaceTests.java
@@ -3,6 +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.UntypedFunctionDefinitionNode;
+import org.shedlang.compiler.ast.untyped.UntypedNamespaceNode;
import org.shedlang.compiler.ast.untyped.UntypedStructDefinitionNode;
import org.shedlang.compiler.typechecker.errors.ReferenceBeforeDefinitionError;
import org.shedlang.compiler.types.*;
@@ -33,6 +34,26 @@ public class TypeCheckerNamespaceTests {
}
@Test
+ public void canTypeCheckImports() {
+ var untyped = UntypedNamespaceNode.builder()
+ .addImport(Untyped.import_(NamespaceName.of("A")))
+ .addImport(Untyped.import_(NamespaceName.of("B")))
+ .build();
+ var context = TypeCheckerContext.EMPTY
+ .enterGlobal(P.map(Map.entry("Unit", Types.metaType(Types.UNIT))));
+
+ var result = TypeChecker.typeCheckNamespace(untyped, context);
+
+ assertThat(
+ result.value(),
+ isTypedNamespaceNode().withImports(isSequence(
+ isTypedImportNode(NamespaceName.of("A")),
+ isTypedImportNode(NamespaceName.of("B"))
+ ))
+ );
+ }
+
+ @Test
public void canTypeCheckMinimalFunctionDefinition() {
var untyped = Untyped.namespace(List.of(
UntypedFunctionDefinitionNode.builder()