Create separate notion of receiver for FieldLoadInstruction

2 files changed, 6 insertions, 2 deletions

diff --git a/src/test/java/org/shedlang/compiler/stackir/InstructionSerializerTests.java b/src/test/java/org/shedlang/compiler/stackir/InstructionSerializerTests.java
index b9166fac..f71d9885 100644
--- a/src/test/java/org/shedlang/compiler/stackir/InstructionSerializerTests.java
+++ b/src/test/java/org/shedlang/compiler/stackir/InstructionSerializerTests.java
@@ -81,7 +81,7 @@ public class InstructionSerializerTests {
 
         var string = serialize(instruction);
 
-        assertThat(string, equalTo("(field-load \"Example/Lib\" \"x\")"));
+        assertThat(string, equalTo("(field-load (namespace \"Example/Lib\") \"x\")"));
     }
 
     @Test
diff --git a/src/test/java/org/shedlang/compiler/stackir/instructions/Instructions.java b/src/test/java/org/shedlang/compiler/stackir/instructions/Instructions.java
index ae1e0a4c..d07709a9 100644
--- a/src/test/java/org/shedlang/compiler/stackir/instructions/Instructions.java
+++ b/src/test/java/org/shedlang/compiler/stackir/instructions/Instructions.java
@@ -23,7 +23,11 @@ public class Instructions {
     }
 
     public static Instruction fieldLoad(NamespaceName namespaceName, String fieldName) {
-        return new FieldLoadInstruction(namespaceName, fieldName, Sources.NULL);
+        return new FieldLoadInstruction(
+            new FieldLoadInstruction.Receiver.Namespace(namespaceName),
+            fieldName,
+            Sources.NULL
+        );
     }
 
     public static Instruction if_(