Combine assign, val and var statements

4 files changed, 8 insertions, 17 deletions

diff --git a/src/test/java/org/shedlang/compiler/stackir/StackCompilerAssignTests.java b/src/test/java/org/shedlang/compiler/stackir/StackCompilerAssignTests.java
index 5b138e7d..20abbff3 100644
--- a/src/test/java/org/shedlang/compiler/stackir/StackCompilerAssignTests.java
+++ b/src/test/java/org/shedlang/compiler/stackir/StackCompilerAssignTests.java
@@ -12,7 +12,7 @@ public class StackCompilerAssignTests {
     @Test
     public void expressionIsEvaluatedAndStoredAsVar() {
         var node = Typed.assign(
-            Typed.targetVariable("x"),
+            Typed.targetReassign("x"),
             Typed.stringLiteral("hello")
         );
         var context = StackCompiler.Context.EMPTY
diff --git a/src/test/java/org/shedlang/compiler/stackir/StackCompilerReferenceTests.java b/src/test/java/org/shedlang/compiler/stackir/StackCompilerReferenceTests.java
index 1e98c35e..f00631c3 100644
--- a/src/test/java/org/shedlang/compiler/stackir/StackCompilerReferenceTests.java
+++ b/src/test/java/org/shedlang/compiler/stackir/StackCompilerReferenceTests.java
@@ -27,7 +27,7 @@ public class StackCompilerReferenceTests {
         var context = StackCompiler.Context.EMPTY
             .addShedVariable("x");
         context = StackCompiler.compileFunctionStatement(
-            Typed.var(Typed.targetVariable("x"), Typed.intLiteral(0)),
+            Typed.var("x", Typed.intLiteral(0)),
             context
         );
 
diff --git a/src/test/java/org/shedlang/compiler/stackir/StackCompilerValTests.java b/src/test/java/org/shedlang/compiler/stackir/StackCompilerValTests.java
index 6424f649..b72055fd 100644
--- a/src/test/java/org/shedlang/compiler/stackir/StackCompilerValTests.java
+++ b/src/test/java/org/shedlang/compiler/stackir/StackCompilerValTests.java
@@ -13,10 +13,7 @@ import static org.zwobble.precisely.Matchers.isSequence;
 public class StackCompilerValTests {
     @Test
     public void whenValIsFunctionStatementThenExpressionIsEvaluatedAndStoredAsLocal() {
-        var node = Typed.val(
-            Typed.targetVariable("x"),
-            Typed.stringLiteral("hello")
-        );
+        var node = Typed.val("x", Typed.stringLiteral("hello"));
         var context = StackCompiler.Context.EMPTY
             .addShedVariable("x");
 
@@ -30,10 +27,7 @@ public class StackCompilerValTests {
 
     @Test
     public void whenValIsNamespaceStatementThenExpressionIsEvaluatedAndStoredAsLocal() {
-        var node = Typed.val(
-            Typed.targetVariable("x"),
-            Typed.stringLiteral("hello")
-        );
+        var node = Typed.val("x", Typed.stringLiteral("hello"));
         var context = StackCompiler.Context.EMPTY
             .addShedVariable("x");
 
@@ -48,7 +42,7 @@ public class StackCompilerValTests {
     @Test
     public void valsInDifferentBlocksAssignToDifferentLocals() {
         var nodes = List.of(
-            Typed.val(Typed.targetVariable("x"), Typed.intLiteral(10)),
+            Typed.val("x", Typed.intLiteral(10)),
             Typed.expressionStatement(Typed.reference("x")),
             Typed.expressionStatement(Typed.if_(
                 List.of(
@@ -56,7 +50,7 @@ public class StackCompilerValTests {
                         Typed.boolLiteral(true),
                         Typed.block(
                             List.of(
-                                Typed.val(Typed.targetVariable("x"), Typed.intLiteral(11)),
+                                Typed.val("x", Typed.intLiteral(11)),
                                 Typed.expressionStatement(Typed.reference("x"))
                             ),
                             List.of("x")
@@ -65,7 +59,7 @@ public class StackCompilerValTests {
                 ),
                 Typed.block(
                     List.of(
-                        Typed.val(Typed.targetVariable("x"), Typed.intLiteral(12)),
+                        Typed.val("x", Typed.intLiteral(12)),
                         Typed.expressionStatement(Typed.reference("x"))
                     ),
                     List.of("x")
diff --git a/src/test/java/org/shedlang/compiler/stackir/StackCompilerVarTests.java b/src/test/java/org/shedlang/compiler/stackir/StackCompilerVarTests.java
index 414f20d9..fc133877 100644
--- a/src/test/java/org/shedlang/compiler/stackir/StackCompilerVarTests.java
+++ b/src/test/java/org/shedlang/compiler/stackir/StackCompilerVarTests.java
@@ -10,10 +10,7 @@ import static org.zwobble.precisely.Matchers.isSequence;
 public class StackCompilerVarTests {
     @Test
     public void expressionIsEvaluatedAndStoredAsVar() {
-        var node = Typed.var(
-            Typed.targetVariable("x"),
-            Typed.stringLiteral("hello")
-        );
+        var node = Typed.var("x", Typed.stringLiteral("hello"));
         var context = StackCompiler.Context.EMPTY
             .addShedVariable("x");