Fix complex assign

PRL-PRG · Nov 13, 2024 · 1f51b19 · 1f51b19
1 parent 2c75dba
commit 1f51b19
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ TOOLS_DIR := $(BASE_DIR)/tools
 
 .PHONY: setup
 setup:
-	$(MAKE) -C external
+	$(MAKE) -C external setup
 	$(MAKE) -C client setup
 
 .PHONY: setup-git

diff --git a/client/rsh/src/bc2c/runtime.h b/client/rsh/src/bc2c/runtime.h
@@ -7,7 +7,6 @@
 // MAKE SURE Rinternals.h is not listed!
 #include "R_ext/Boolean.h"
 #include "runtime_internals.h"
-#include <assert.h>
 #include <limits.h>
 #include <math.h>
 #include <stdint.h>

diff --git a/server/src/main/java/org/prlprg/bc2c/BC2CCompiler.java b/server/src/main/java/org/prlprg/bc2c/BC2CCompiler.java
@@ -243,11 +243,11 @@ private void compile(BcInstr instr, int pc) {
           }
           case BcInstr.Dup() -> {
             stack.push();
-            yield "%s = %s;".formatted(stack.get(0), stack.get(-2));
+            yield "%s = %s;".formatted(stack.get(0), stack.get(-1));
           }
           case BcInstr.Dup2nd() -> {
             stack.push();
-            yield "%s = %s;".formatted(stack.get(0), stack.get(-3));
+            yield "%s = %s;".formatted(stack.get(0), stack.get(-2));
           }
           default -> {
             if (instr.label().orElse(null) instanceof BcLabel l) {

diff --git a/server/src/test/java/org/prlprg/bc2c/BC2CCompilerTest.java b/server/src/test/java/org/prlprg/bc2c/BC2CCompilerTest.java
@@ -535,7 +535,8 @@ public void testIf(BC2CSnapshot snapshot) {
   }
 
   @Test
-  public void testAdhoc(BC2CSnapshot snapshot) {
+  public void testSubsetAndComplexAssign(BC2CSnapshot snapshot) {
+    // from bounce benchmark
     snapshot.verify("""
             b <- list()
             b[[1]] <- c(1,2,3)

diff --git a/.../test/resources/org/prlprg/bc2c/snapshots/BC2CCompilerTest/testSubsetAndComplexAssign.RDS b/.../test/resources/org/prlprg/bc2c/snapshots/BC2CCompilerTest/testSubsetAndComplexAssign.RDS