Remove intermediate variable

3 files changed, 2 insertions, 14 deletions

diff --git a/src/main/java/org/shedlang/compiler/shid/ShidCodeGen.java b/src/main/java/org/shedlang/compiler/shid/ShidCodeGen.java
index 59a5bc87..64a61a03 100644
--- a/src/main/java/org/shedlang/compiler/shid/ShidCodeGen.java
+++ b/src/main/java/org/shedlang/compiler/shid/ShidCodeGen.java
@@ -590,14 +590,6 @@ public class ShidCodeGen {
             );
 
             context = context.addInstruction(
-                new ShidLocalStore(shidFunctionName, methodNode.source())
-            );
-
-            context = context.addInstruction(
-                new ShidLocalLoad(shidFunctionName, methodNode.source())
-            );
-
-            context = context.addInstruction(
                 new ShidMethodStore(
                     structType,
                     methodNode.name(),
diff --git a/src/test/java/org/shedlang/compiler/shid/ShidCodeGenNamespaceTests.java b/src/test/java/org/shedlang/compiler/shid/ShidCodeGenNamespaceTests.java
index e389a34c..501637a4 100644
--- a/src/test/java/org/shedlang/compiler/shid/ShidCodeGenNamespaceTests.java
+++ b/src/test/java/org/shedlang/compiler/shid/ShidCodeGenNamespaceTests.java
@@ -152,10 +152,8 @@ public class ShidCodeGenNamespaceTests {
             isShidLocalStore("User__0"),
             instanceOf(
                 ShidDefineFunction.class,
-                has("name", x -> x.name(), equalTo("$methods__Example_Project__User__name__0"))
+                has("name", x -> x.name(), equalTo("$methods__Example_Project__User__name"))
             ),
-            isShidLocalStore("$methods__Example_Project__User__name__0"),
-            isShidLocalLoad("$methods__Example_Project__User__name__0"),
             isShidMethodStore(structType, "name")
         )));
     }
diff --git a/src/test/java/org/shedlang/compiler/shid/ShidCodeGenStructDefinitionTests.java b/src/test/java/org/shedlang/compiler/shid/ShidCodeGenStructDefinitionTests.java
index df6dee0e..d8da52b5 100644
--- a/src/test/java/org/shedlang/compiler/shid/ShidCodeGenStructDefinitionTests.java
+++ b/src/test/java/org/shedlang/compiler/shid/ShidCodeGenStructDefinitionTests.java
@@ -66,7 +66,7 @@ public class ShidCodeGenStructDefinitionTests {
         assertThat(result.instructions(), isSequence(
             instanceOf(
                 ShidDefineFunction.class,
-                has("name", x -> x.name(), equalTo("$methods__Example_Project__User__name__0")),
+                has("name", x -> x.name(), equalTo("$methods__Example_Project__User__name")),
                 has("positionalParams", x -> x.positionalParams(), isSequence(
                     isShidDefineFunctionParam("this__0"),
                     isShidDefineFunctionParam("a__0")
@@ -80,8 +80,6 @@ public class ShidCodeGenStructDefinitionTests {
                     isShidReturn()
                 )))
             ),
-            isShidLocalStore("$methods__Example_Project__User__name__0"),
-            isShidLocalLoad("$methods__Example_Project__User__name__0"),
             isShidMethodStore(structType, "name")
         ));
     }