diff options
| author | Michael Williamson <mike@zwobble.org> | 2023-09-28 11:10:19 +0100 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2023-09-28 11:10:19 +0100 |
| commit | 5dd379c50eb0a9eff9ab87c7edf9cb10c20529e0 (patch) | |
| tree | f9d6277c547e2520630f0cbbc297a4ef2a9ac27a /src/main/java | |
| parent | 8d3e6ce5e6c77ff27e99f0f8ca0b22ff943b7d3f (diff) | |
Add struct type info during type checking
Diffstat (limited to 'src/main/java')
3 files changed, 49 insertions, 10 deletions
diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java index 1c8bbd54..64a2444c 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java +++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java @@ -1,5 +1,6 @@ package org.shedlang.compiler.typechecker; +import org.pcollections.OrderedPMap; import org.shedlang.compiler.ast.typed.*; import org.shedlang.compiler.ast.untyped.*; import org.shedlang.compiler.sources.Source; @@ -792,24 +793,34 @@ public class TypeChecker { public TypeCheckerContext declareTypes(TypeCheckerContext context) { // TODO: better error var type = new StructType(context.namespaceName().orElseThrow(), untyped.name()); + + context = context.addLexicalState(untyped.name(), type); + return context.define(untyped.name(), Types.metaType(type), untyped.source()); } @Override public TypeCheckerResult<TypedStructDefinitionNode> finish(TypeCheckerContext context) { - var fieldsResult = context.mapWithContext(untyped.fields(), (untypedField, fieldContext) -> { - return fieldContext.toResult(new TypedStructFieldDefinitionNode( + var typedFieldNodes = new ArrayList<TypedStructFieldDefinitionNode>(); + var fieldTypes = OrderedPMap.<String, Type>empty(); + + for (var untypedField : untyped.fields()) { + var typedFieldNode = new TypedStructFieldDefinitionNode( untypedField.name(), - typeCheckTypeLevelExpression(TypeSets.META_TYPE, untypedField.type(), fieldContext), + typeCheckTypeLevelExpression(TypeSets.META_TYPE, untypedField.type(), context), untypedField.source() - )); - }); - var fields = fieldsResult.value(); - context = fieldsResult.context(); + ); + typedFieldNodes.add(typedFieldNode); + fieldTypes = fieldTypes.plus(untypedField.name(), typedFieldNode.type().value()); + } + + var type = context.getLexicalState(StructType.class, untyped.name()); + + context = context.addStructTypeInfo(type, new StructTypeInfo(fieldTypes)); return context.toResult(new TypedStructDefinitionNode( untyped.name(), - fields, + typedFieldNodes, untyped.source() )); } diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java b/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java index 044f5041..06b237e1 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java +++ b/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java @@ -20,6 +20,7 @@ import java.util.function.Function; public class TypeCheckerContext { public static final TypeCheckerContext EMPTY = new TypeCheckerContext( Empty.map(), + Empty.map(), P.stack(new LexicalContext( Optional.empty(), Empty.map(), @@ -103,13 +104,16 @@ public class TypeCheckerContext { } private final PMap<NamespaceName, NamespaceTypeInfo> namespaceTypeInfo; + private final PMap<StructType, StructTypeInfo> structTypeInfo; private final PStack<StackElement> stack; public TypeCheckerContext( PMap<NamespaceName, NamespaceTypeInfo> namespaceTypeInfo, + PMap<StructType, StructTypeInfo> structTypeInfo, PStack<StackElement> stack ) { this.namespaceTypeInfo = namespaceTypeInfo; + this.structTypeInfo = structTypeInfo; this.stack = stack; } @@ -138,6 +142,7 @@ public class TypeCheckerContext { return new TypeCheckerContext( this.namespaceTypeInfo, + this.structTypeInfo, newStack ); } @@ -174,6 +179,7 @@ public class TypeCheckerContext { ) { return new TypeCheckerContext( this.namespaceTypeInfo, + this.structTypeInfo, this.stack.plus(new LexicalContext( newNamespaceName, this.environment().plusAll(newEnvironment), @@ -189,6 +195,7 @@ public class TypeCheckerContext { public TypeCheckerContext exit() { return new TypeCheckerContext( this.namespaceTypeInfo, + this.structTypeInfo, this.stack.minus(0) ); } @@ -197,6 +204,7 @@ public class TypeCheckerContext { // TODO: do this properly (should not affect environment, possibly other bits of lexical context) return new TypeCheckerContext( this.namespaceTypeInfo, + this.structTypeInfo, this.stack.plus(FreeVariableCapture.EMPTY) ); } @@ -232,7 +240,11 @@ public class TypeCheckerContext { } } - return new TypeCheckerContext(namespaceTypeInfo, newLexicalContextStack); + return new TypeCheckerContext( + this.namespaceTypeInfo, + this.structTypeInfo, + newLexicalContextStack + ); } public Optional<Variable> compileTimeLookup(String name) { @@ -329,6 +341,7 @@ public class TypeCheckerContext { return new TypeCheckerContext( this.namespaceTypeInfo.plus(namespaceName, namespaceTypeInfo), + this.structTypeInfo, this.stack ); } @@ -337,6 +350,21 @@ public class TypeCheckerContext { return namespaceTypeInfo; } + public TypeCheckerContext addStructTypeInfo( + StructType structType, + StructTypeInfo structTypeInfo + ) { + return new TypeCheckerContext( + this.namespaceTypeInfo, + this.structTypeInfo.plus(structType, structTypeInfo), + this.stack + ); + } + + public PMap<StructType, StructTypeInfo> structTypeInfo() { + return structTypeInfo; + } + public <T> TypeCheckerResult<T> toResult(T value) { return new TypeCheckerResult<>(value, this); } diff --git a/src/main/java/org/shedlang/compiler/types/Types.java b/src/main/java/org/shedlang/compiler/types/Types.java index f56f0ca7..5600d1d9 100644 --- a/src/main/java/org/shedlang/compiler/types/Types.java +++ b/src/main/java/org/shedlang/compiler/types/Types.java @@ -14,7 +14,7 @@ public class Types { public static final Type TOP = TopType.INSTANCE; public static final Type UNIT = UnitType.INSTANCE; - public static Type struct(NamespaceName namespaceName, String name) { + public static StructType struct(NamespaceName namespaceName, String name) { return new StructType(namespaceName, name); } |
