From 02d0212a2695275d25783932982d14a8a3c1a1ec Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 2 Mar 2025 19:59:51 +0000 Subject: Support accessing native methods --- .../org/shedlang/compiler/typechecker/TypeChecker.java | 17 +++++++++++------ .../compiler/typechecker/TypeCheckerContext.java | 5 +++++ .../typechecker/errors/MissingNativeTypeInfoError.java | 18 ++++++++++++++++++ .../org/shedlang/compiler/types/NativeTypeInfo.java | 9 +++++++++ 4 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 src/main/java/org/shedlang/compiler/typechecker/errors/MissingNativeTypeInfoError.java (limited to 'src/main/java') diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java index 72404d42..4c1c9222 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java +++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java @@ -1470,18 +1470,23 @@ public class TypeChecker { )); } - case SimpleStructType receiverTypeStruct -> { - // TODO: handle ambiguity - var structTypeInfo = context.structTypeInfo(receiverTypeStruct, source); - return structTypeInfo.memberAccess(memberName); - } - case NamespaceType receiverTypeNamespace -> { var namespaceTypeInfo = context.namespaceTypeInfo(receiverTypeNamespace, source); var fieldType = namespaceTypeInfo.fieldType(memberName); return fieldType.map(MemberAccess::field); } + case SimpleNativeType receiverTypeNative -> { + var nativeTypeInfo = context.nativeTypeInfo(receiverTypeNative, source); + return nativeTypeInfo.memberAccess(memberName); + } + + case SimpleStructType receiverTypeStruct -> { + // TODO: handle ambiguity + var structTypeInfo = context.structTypeInfo(receiverTypeStruct, source); + return structTypeInfo.memberAccess(memberName); + } + case TypeLevelValueType receiverTypeTypeLevelValue when receiverTypeTypeLevelValue.value() instanceof UserDefinedEffect effect -> { var effectInfo = context.userDefinedEffectInfo(effect, source); var methodType = effectInfo.methodType(memberName) diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java b/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java index e9addbc2..63ceebcb 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java +++ b/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java @@ -487,6 +487,11 @@ public class TypeCheckerContext { ); } + public NativeTypeInfo nativeTypeInfo(SimpleNativeType type, Source source) { + return this.typeInfos.nativeTypeInfo(type) + .orElseThrow(() -> new MissingNativeTypeInfoError(type, source)); + } + public TypeCheckerContext addStructTypeInfo( SimpleStructType structType, StructTypeInfo structTypeInfo diff --git a/src/main/java/org/shedlang/compiler/typechecker/errors/MissingNativeTypeInfoError.java b/src/main/java/org/shedlang/compiler/typechecker/errors/MissingNativeTypeInfoError.java new file mode 100644 index 00000000..8ab335d4 --- /dev/null +++ b/src/main/java/org/shedlang/compiler/typechecker/errors/MissingNativeTypeInfoError.java @@ -0,0 +1,18 @@ +package org.shedlang.compiler.typechecker.errors; + +import org.shedlang.compiler.errors.InternalCompilerError; +import org.shedlang.compiler.sources.Source; +import org.shedlang.compiler.types.SimpleNativeType; + +public class MissingNativeTypeInfoError extends InternalCompilerError { + private final SimpleNativeType type; + + public MissingNativeTypeInfoError(SimpleNativeType type, Source source) { + super("Missing type info for native type " + type, source); + this.type = type; + } + + public SimpleNativeType type() { + return type; + } +} diff --git a/src/main/java/org/shedlang/compiler/types/NativeTypeInfo.java b/src/main/java/org/shedlang/compiler/types/NativeTypeInfo.java index c87266d8..4f72b148 100644 --- a/src/main/java/org/shedlang/compiler/types/NativeTypeInfo.java +++ b/src/main/java/org/shedlang/compiler/types/NativeTypeInfo.java @@ -4,10 +4,19 @@ import org.pcollections.PVector; import org.shedlang.compiler.util.P; import java.util.List; +import java.util.Optional; public record NativeTypeInfo( List methods ) { + public Optional memberAccess(String memberName) { + // TODO: handle (or prevent) duplicate method names + return methods.stream() + .filter(method -> method.name().equals(memberName)) + .findFirst() + .map(method -> MemberAccess.method(method.type())); + } + public static Builder builder() { return new Builder(P.vector()); } -- cgit v1.2.3