From 09da904f2de0b16f883add671469989bafc726e9 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Thu, 28 Sep 2023 13:59:18 +0100 Subject: Add struct receiver for field loads --- src/main/java/org/shedlang/compiler/patio/PatioCodeGen.java | 4 ++++ .../java/org/shedlang/compiler/stackir/InstructionSerializer.java | 6 ++++++ .../compiler/stackir/instructions/FieldLoadInstruction.java | 2 ++ 3 files changed, 12 insertions(+) (limited to 'src/main/java') diff --git a/src/main/java/org/shedlang/compiler/patio/PatioCodeGen.java b/src/main/java/org/shedlang/compiler/patio/PatioCodeGen.java index 41df54f4..a78c5eaf 100644 --- a/src/main/java/org/shedlang/compiler/patio/PatioCodeGen.java +++ b/src/main/java/org/shedlang/compiler/patio/PatioCodeGen.java @@ -257,6 +257,10 @@ public class PatioCodeGen { context ); } + + case FieldLoadInstruction.Receiver.Struct struct -> { + throw new UnsupportedOperationException("TODO"); + } } context = context.temporaryPush(target); diff --git a/src/main/java/org/shedlang/compiler/stackir/InstructionSerializer.java b/src/main/java/org/shedlang/compiler/stackir/InstructionSerializer.java index 53d0ce44..5336c41d 100644 --- a/src/main/java/org/shedlang/compiler/stackir/InstructionSerializer.java +++ b/src/main/java/org/shedlang/compiler/stackir/InstructionSerializer.java @@ -90,6 +90,12 @@ public class InstructionSerializer { treeIdentifier("namespace"), treeString(namespace.name().toString()) ); + + case FieldLoadInstruction.Receiver.Struct struct -> + treeList( + treeIdentifier("struct"), + treeString(struct.type().describe()) + ); }, treeString(fieldLoad.fieldName()) ); diff --git a/src/main/java/org/shedlang/compiler/stackir/instructions/FieldLoadInstruction.java b/src/main/java/org/shedlang/compiler/stackir/instructions/FieldLoadInstruction.java index 6428e30e..816da14e 100644 --- a/src/main/java/org/shedlang/compiler/stackir/instructions/FieldLoadInstruction.java +++ b/src/main/java/org/shedlang/compiler/stackir/instructions/FieldLoadInstruction.java @@ -2,6 +2,7 @@ package org.shedlang.compiler.stackir.instructions; import org.shedlang.compiler.sources.Source; import org.shedlang.compiler.types.NamespaceName; +import org.shedlang.compiler.types.StructType; /** * Pop a value from the stack, get the given field from the popped value, and @@ -14,5 +15,6 @@ public record FieldLoadInstruction( ) implements Instruction { public sealed interface Receiver { record Namespace(NamespaceName name) implements Receiver {} + record Struct(StructType type) implements Receiver {} } } -- cgit v1.2.3