Fix #409 by moving increment to the beginning of the loop

Reviewed-on: #426

resources/bytecode/javFiles/Bug409.jav

@@ -0,0 +1,13 @@
+import java.lang.Integer;
+
+public class Bug409 {
+    public static m() {
+        var n = 0;
+        for (var i = 0; i < 5; i++) {
+            n = n + 1;
+            if (n > 100) { return -1; }
+            if (i == 2) { continue; }
+        }
+        return n;
+    }
+}

resources/bytecode/javFiles/Bug421.jav

@@ -0,0 +1,3 @@
+public class Bug421 {
+    public m() { return 1 } // Missing semicolon
+}

resources/bytecode/javFiles/Bug423.jav

@@ -0,0 +1,5 @@
+import java.lang.Integer;
+
+interface Bug423I { Integer f(); }
+
+public class Bug423 implements Bug423I { }

resources/bytecode/javFiles/Interfaces.jav

@@ -15,6 +15,7 @@ interface C {
 }
 
 class ClassX implements A {
+    void method1() {}
 }
 
 record ClassY(Integer myInt) implements C {}

src/main/java/de/dhbwstuttgart/bytecode/Codegen.java

@@ -1067,14 +1067,6 @@ public class Codegen {
                 mv.visitJumpInsn(IFEQ, end);
             }
 
-            var env = new BreakEnv();
-            env.startLabel = start;
-            env.endLabel = end;
-
-            state.breakStack.push(env);
-            generate(state, _for.body());
-            state.breakStack.pop();
-
             if (_for.increment() != null) {
                 _for.increment().forEach(e -> {
                     generate(state, e);
@@ -1083,6 +1075,15 @@ public class Codegen {
                     }
                 });
             }
+
+            var env = new BreakEnv();
+            env.startLabel = start;
+            env.endLabel = end;
+
+            state.breakStack.push(env);
+            generate(state, _for.body());
+            state.breakStack.pop();
+
             mv.visitJumpInsn(GOTO, start);
             mv.visitLabel(end);
             state.exitScope();
@@ -1846,6 +1847,35 @@ public class Codegen {
         clazz.constructors().forEach(this::generateConstructor);
         clazz.methods().forEach(this::generateMethod);
 
+        // Check if non abstract class implements all interface methods
+        if ((access & ACC_ABSTRACT) == 0) {
+            for (var intf : clazz.implementingInterfaces()) {
+                var intfClass = compiler.getClass(new JavaClassName(intf.name()));
+                for (var method : intfClass.getMethods()) {
+                    if ((method.modifier & ACC_ABSTRACT) != 0) {
+                        // Check if the method is implemented in the current class
+                        // TODO This is duplicate code, we should probably refactor instances of this pattern
+                        var foundMethods = clazz.methods().stream().filter(m -> {
+                            if (!m.name().equals(method.name)) return false;
+                            if (m.signature().parameters().size() != method.getParameterList().getFormalparalist().size())
+                                return false;
+                            for (var i = 0; i < m.signature().parameters().size(); i++) {
+                                var param1 = m.signature().parameters().get(i).pattern().type();
+                                var param2 = converter.convert(
+                                    method.getParameterList().getParameterAt(i).getType(),
+                                    ASTToTargetAST.Generics.nullGenerics(compiler).javaGenerics());
+                                if (!param1.equals(param2)) return false;
+                            }
+                            return true;
+                        }).toList();
+                        if (foundMethods.size() != 1) {
+                            throw new CodeGenException("Class " + clazz.qualifiedName() + " does not implement method " + method.name + " from interface " + intfClass.getClassName());
+                        }
+                    }
+                }
+            }
+        }
+
         if (clazz.staticConstructor() != null)
             generateStaticConstructor(clazz.staticConstructor());
 

src/main/java/de/dhbwstuttgart/exceptions/ParserError.java

@@ -2,9 +2,8 @@ package de.dhbwstuttgart.exceptions;
 
 import org.antlr.v4.runtime.Token;
 
-public class ParserError extends TypeinferenceException{
-
-	public ParserError(Token offset){
-		super("Fehler beim Parsen", offset);
+public class ParserError extends RuntimeException{
+	public ParserError(String message) {
+		super(message);
 	}
 }

src/main/java/de/dhbwstuttgart/parser/JavaTXParser.java

@@ -1,6 +1,7 @@
 package de.dhbwstuttgart.parser;
 
 import de.dhbwstuttgart.environment.CompilationEnvironment;
+import de.dhbwstuttgart.exceptions.ParserError;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.SyntaxTreeGenerator;
 import de.dhbwstuttgart.parser.antlr.Java17Lexer;
 import de.dhbwstuttgart.parser.antlr.Java17Parser;
@@ -8,9 +9,7 @@ import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
 import de.dhbwstuttgart.syntaxtree.SourceFile;
 
 import de.dhbwstuttgart.util.Logger;
-import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.*;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
@@ -21,13 +20,25 @@ public class JavaTXParser {
 
     public static Logger logger = new Logger("Parser");
 
+    public static class ThrowingErrorListener extends BaseErrorListener {
+
+        @Override
+        public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol,
+                                int line, int charPositionInLine, String msg, RecognitionException e) {
+            throw new ParserError("Syntax error at line " + line +  ":" + charPositionInLine + " - " + msg);
+        }
+    }
+
     public static Java17Parser.SourceFileContext parse(File source) throws IOException, java.lang.ClassNotFoundException {
         InputStream stream = new FileInputStream(source);
         // DEPRECATED: ANTLRInputStream input = new ANTLRInputStream(stream);
+        var errorListener = new ThrowingErrorListener();
         CharStream input = CharStreams.fromStream(stream);
         Java17Lexer lexer = new Java17Lexer(input);
+        lexer.addErrorListener(errorListener);
         CommonTokenStream tokens = new CommonTokenStream(lexer);
         Java17Parser parser = new Java17Parser(tokens);
+        parser.addErrorListener(errorListener);
         return parser.sourceFile();
         /*
          * SyntaxTreeGenerator generator = new SyntaxTreeGenerator(environment.getRegistry(source)); return generator.convert(tree);

src/test/java/TestComplete.java

@@ -2,7 +2,7 @@
 import de.dhbwstuttgart.bytecode.CodeGenException;
 import de.dhbwstuttgart.core.ConsoleInterface;
 import de.dhbwstuttgart.exceptions.CompilerException;
-import de.dhbwstuttgart.exceptions.DebugException;
+import de.dhbwstuttgart.exceptions.ParserError;
 import de.dhbwstuttgart.exceptions.WarningsException;
 import de.dhbwstuttgart.util.Logger;
 import de.dhbwstuttgart.util.Logger.LogLevel;
@@ -1083,9 +1083,9 @@ public class TestComplete {
         assertEquals(40.0, m.invoke(instance, d, 0));
     }
 
+    @Disabled("Waiting for #407, skipping for now")
     @Test
     public void testPatternMatchingInterface() throws Exception {
-        ConsoleInterface.logLevel = LogLevel.INFO;
         var classFiles = generateClassFiles(createClassLoader(), false, "Matcher.jav", "PatternMatchingInterface.jav");
         var Intf = classFiles.get("Interface");
         var clazz = classFiles.get("PatternMatchingInterface");
@@ -1707,6 +1707,16 @@ public class TestComplete {
         clazz.getDeclaredMethod("main", List.class).invoke(null, List.of());
     }
 
+    @Test
+    public void testBug423() throws Exception {
+        try {
+            var classFiles = generateClassFiles(createClassLoader(), "Bug423.jav");
+            fail("No exception thrown!");
+        } catch (CodeGenException e) {
+            assertEquals("Class Bug423 does not implement method f from interface Bug423I", e.getMessage());
+        }
+    }
+
     @Test
     public void testBug422() throws Exception {
         try {
@@ -1716,4 +1726,23 @@ public class TestComplete {
             assertEquals("Duplicate class definition: Bug422", e.getMessage());
         }
     }
+
+    @Test
+    public void testBug421() throws Exception {
+        try {
+            var classFiles = generateClassFiles(createClassLoader(), "Bug421.jav");
+            fail("Shouldn't compile!");
+        } catch (ParserError e) {
+            assertEquals("Syntax error at line 2:26 - no viable alternative at input 'm() { return 1 }'", e.getMessage());
+        }
+    }
+
+    @Test
+    public void testBug409() throws Exception {
+        var classFiles = generateClassFiles(createClassLoader(), "Bug409.jav");
+        var clazz = classFiles.get("Bug409");
+        var instance = clazz.getDeclaredConstructor().newInstance();
+        var m = clazz.getDeclaredMethod("m");
+        assertEquals(5, m.invoke(instance));
+    }
 }