updated tests to use interpreterbase

Author: GilbertBckr

src/main/java/com/compiler/ast/ASTDoWhileLoopStmtNode.java

@@ -43,7 +43,7 @@ public void codegen(CompileEnvIntf env) {
         env.setCurrentBlock(doWhile);
         m_loopBody.codegen(env);
         InstrCondJump conditionalJump = new InstrCondJump(m_predicate.codegen(env), doWhile, exit);
-        doWhile.addInstr(conditionalJump);
+        env.addInstr(conditionalJump);
 
         env.setCurrentBlock(exit);
     }

src/main/java/com/compiler/ast/ASTWhileLoopStmtNode.java

@@ -41,8 +41,10 @@ public void codegen(CompileEnvIntf env) {
         env.addInstr(jumpToHead);
 
         env.setCurrentBlock(whileBody);
+
         m_loopBody.codegen(env);
-        whileBody.addInstr(new InstrJump(whileHead));
+
+        env.addInstr(new InstrJump(whileHead));
 
         env.setCurrentBlock(whileHead);
         InstrCondJump conditionalJump = new InstrCondJump(m_predicate.codegen(env), whileBody, exit);

src/test/java/com/compiler/StmtDoWhileStmtParserTest.java

@@ -2,65 +2,87 @@
 
 import org.junit.Test;
 
-public class StmtDoWhileStmtParserTest extends StmtParserTestBase
-{
-    @Test
-    public void testWhileProgram1() throws Exception {
-        String program = """
-            {
-              DECLARE index;
-              DECLARE sum;
-              index = 10;
-              sum = 0;
-              WHILE(index) {
-                sum = sum + index;
-                index = index - 1;
-              };
-              PRINT sum;
-            }
-            """;
-        // laut kleinem Gauß: 55
-        testParser(program, "55\n");
-    }
+public class StmtDoWhileStmtParserTest extends InterpreterTestBase {
+  @Test
+  public void testWhileProgram1() throws Exception {
+    String program = """
+        {
+          DECLARE index;
+          DECLARE sum;
+          index = 10;
+          sum = 0;
+          WHILE(index) {
+            sum = sum + index;
+            index = index - 1;
+          };
+          PRINT sum;
+        }
+        """;
+    // laut kleinem Gauß: 55
+    testInterpreter(program, "55\n");
+  }
 
-    @Test
-    public void testDoWhileProgram2() throws Exception {
-        String program = """
-            {
-              DECLARE index;
-              DECLARE sum;
-              index = 10;
-              sum = 0;
-              DO {
-                sum = sum + index;
-                index = index - 1;
-              } WHILE(index);
-              PRINT sum;
-            }
-            """;
-        testParser(program, "55\n");
-    }
+  @Test
+  public void testDoWhileProgram2() throws Exception {
+    String program = """
+        {
+          DECLARE index;
+          DECLARE sum;
+          index = 10;
+          sum = 0;
+          DO {
+            sum = sum + index;
+            index = index - 1;
+          } WHILE(index);
+          PRINT sum;
+        }
+        """;
+    testInterpreter(program, "55\n");
+  }
 
-    @Test
-    public void testNestedWhileProgram3() throws Exception {
-        String program = """
-            {
-              DECLARE index0;
-              DECLARE sum;
-              DECLARE index1;
-              index0 = 10;
-              sum = 0;
-              WHILE(index0) {
-                index1 = 5;
-                WHILE(index1) {
-                  sum = sum + index1;
-                  index1 = index1 - 1;
-                };
-                index0 = index0 - 1;
-              };
-              PRINT sum;
-            }
-            """;
-        testParser(program, "150\n");
-    }
+  @Test
+  public void testNestedWhileProgram3() throws Exception {
+    String program = """
+        {
+          DECLARE index0;
+          DECLARE sum;
+          DECLARE index1;
+          index0 = 10;
+          sum = 0;
+          WHILE(index0) {
+            index1 = 5;
+            WHILE(index1) {
+              sum = sum + index1;
+              index1 = index1 - 1;
+            };
+            index0 = index0 - 1;
+          };
+          PRINT sum;
+        }
+        """;
+    testInterpreter(program, "150\n");
+  }
+
+  @Test
+  public void testNestedDoWhileProgram4() throws Exception {
+    String program = """
+        {
+          DECLARE index0;
+          DECLARE sum;
+          DECLARE index1;
+          index0 = 10;
+          sum = 0;
+          DO {
+            index1 = 5;
+            DO {
+              sum = sum + index1;
+              index1 = index1 - 1;
+            } WHILE(index1);
+            index0 = index0 - 1;
+          } WHILE(index0) ;
+          PRINT sum;
+        }
+        """;
+    testInterpreter(program, "150\n");
+  }
 }