From 557d07b3ab23feb67b094ede24dcb475008d5a7e Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Thu, 20 Jul 2023 23:39:31 +0100
Subject: Remove int-get instruction

---
 .../compiler/patio/PatioSerializerTests.java        | 21 ++++++---------------
 .../shedlang/compiler/patio/instructions/Patio.java |  4 ----
 2 files changed, 6 insertions(+), 19 deletions(-)

(limited to 'src/test/java')

diff --git a/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java b/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java
index 456e160e..d888053e 100644
--- a/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java
+++ b/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java
@@ -62,7 +62,7 @@ public class PatioSerializerTests {
             .addLocal(Patio.local("local1", PatioTypes.FUNCTION_POINTER))
             .addLocal(Patio.local("local2", PatioTypes.INT))
             .withReturnType(PatioTypes.VOID)
-            .addBodyInstruction(Patio.intGet("local2", 2))
+            .addBodyInstruction(Patio.localStore("local2", Patio.int_(2)))
             .build();
 
         var string = PatioTesting.serializeCompilationUnitElement(element);
@@ -76,7 +76,7 @@ public class PatioSerializerTests {
                 locals=(("local1" function-ptr) ("local2" int))
                 return-type=void
                 body=(
-                    (int-get (local "local2") 2)
+                    (local-store (local "local2") (int 2))
                 )
             )"""
         ));
@@ -147,10 +147,10 @@ public class PatioSerializerTests {
         var instruction = Patio.if_(
             "condition",
             List.of(
-                Patio.intGet("x", 1)
+                Patio.localStore("x", Patio.int_(1))
             ),
             List.of(
-                Patio.intGet("y", 2)
+                Patio.localStore("y", Patio.int_(2))
             )
         );
 
@@ -161,10 +161,10 @@ public class PatioSerializerTests {
                 if
                 (local "condition")
                 (
-                    (int-get (local "x") 1)
+                    (local-store (local "x") (int 1))
                 )
                 (
-                    (int-get (local "y") 2)
+                    (local-store (local "y") (int 2))
                 )
             )"""));
     }
@@ -180,15 +180,6 @@ public class PatioSerializerTests {
         ));
     }
 
-    @Test
-    public void canSerializeIntGet() {
-        var instruction = Patio.intGet("target", 42);
-
-        var string = PatioTesting.serializeInstruction(instruction);
-
-        assertThat(string, equalTo("(int-get (local \"target\") 42)"));
-    }
-
     @Test
     public void canSerializeIntToDataPtr() {
         var instruction = Patio.intToDataPtr("target", "value");
diff --git a/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java b/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java
index efb0909e..2b85183a 100644
--- a/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java
+++ b/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java
@@ -89,10 +89,6 @@ public class Patio {
         );
     }
 
-    public static PatioInstruction intGet(String target, int value) {
-        return new PatioIntGet(new PatioLocalRef(target), value, Sources.NULL);
-    }
-
     public static PatioInstruction intToDataPtr(String target, String value) {
         return new PatioIntToDataPtr(
             new PatioLocalRef(target),
-- 
cgit v1.2.3