aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-10-21 13:38:30 +0100
committerMichael Williamson <mike@zwobble.org>2023-10-21 13:38:30 +0100
commit2759cad35ee775aa655f06598172603797571a9e (patch)
treee9b26b14dbd106bae03fd95bd265d1ccf9925b65 /src/main/java
parent7b1ab8dd8d0e61e466bd277794a582a184f337c7 (diff)
Add imports as bound variables
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/shedlang/compiler/ast/untyped/UntypedImportNode.java3
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/DeclaredVariables.java22
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java5
3 files changed, 28 insertions, 2 deletions
diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedImportNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedImportNode.java
index c21f9c56..8c8103a7 100644
--- a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedImportNode.java
+++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedImportNode.java
@@ -4,4 +4,7 @@ import org.shedlang.compiler.sources.Source;
import org.shedlang.compiler.types.NamespaceName;
public record UntypedImportNode(NamespaceName namespaceName, Source source) implements UntypedNode {
+ public String variableName() {
+ return namespaceName.parts().getLast();
+ }
}
diff --git a/src/main/java/org/shedlang/compiler/typechecker/DeclaredVariables.java b/src/main/java/org/shedlang/compiler/typechecker/DeclaredVariables.java
index 27be00db..2950b170 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/DeclaredVariables.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/DeclaredVariables.java
@@ -46,6 +46,28 @@ class DeclaredVariables {
};
}
+ public static PVector<DeclaredVariable> forImport(
+ UntypedImportNode import_,
+ PVector<DeclaredVariable> variables
+ ) {
+ return variables.plus(new DeclaredVariable(
+ import_.variableName(),
+ VariableType.IMPORT,
+ import_.source()
+ ));
+ }
+
+ public static PVector<DeclaredVariable> forImports(
+ List<UntypedImportNode> imports,
+ PVector<DeclaredVariable> variables
+ ) {
+ for (var import_ : imports) {
+ variables = DeclaredVariables.forImport(import_, variables);
+ }
+
+ return variables;
+ }
+
public static PVector<DeclaredVariable> forNamespaceStatements(
List<UntypedNamespaceStatementNode> statements,
PVector<DeclaredVariable> variables
diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
index f2844b33..9040f9df 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
@@ -689,7 +689,7 @@ public class TypeChecker {
var typedImportNodes = new ArrayList<TypedImportNode>();
for (var import_ : untyped.imports()) {
namespaceEnvironment = namespaceEnvironment.add(
- import_.namespaceName().parts().getLast(),
+ import_.variableName(),
Variable.defined(new NamespaceType(import_.namespaceName()), VariableType.IMPORT),
import_.source()
);
@@ -785,7 +785,8 @@ public class TypeChecker {
dependencyChecker.check();
- var declaredVariables = DeclaredVariables.forNamespaceStatements(untyped.body(), P.vector());
+ var declaredVariables = DeclaredVariables.forImports(untyped.imports(), P.vector());
+ declaredVariables = DeclaredVariables.forNamespaceStatements(untyped.body(), declaredVariables);
// TODO: explicit exports
var namespaceFinalContext = context;