Merge branch 'master' into fix-411

Reviewed-on: #430

resources/bytecode/javFiles/Bug411.jav

@@ -0,0 +1,7 @@
+import java.lang.Integer;
+
+public interface Bug411 {
+    default f() {
+        return 1;
+    }
+}

resources/bytecode/javFiles/Bug412.jav

@@ -0,0 +1,12 @@
+import java.lang.Integer;
+
+public class Bug412 {
+    public m(Integer i) {
+        var r = 0;
+        switch (i) {
+            case 1: r = 10; break;
+            default: r = 20;
+        }
+        return r;
+    }
+}

resources/bytecode/javFiles/Literal.jav

@@ -5,4 +5,8 @@ public class Literal {
     public m2() { return 'C'; }
     public m3() { return 10L; }
     public m4() { return 10.5F; }
+    public m5() { return 10.5D; }
+    public m6() { return 0xFF; }
+    public m7() { return 0b101010; }
+    public m8() { return 010; }
 }

src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/FCGenerator.java

@@ -15,6 +15,7 @@ import de.dhbwstuttgart.typeinference.constraints.Pair;
 import de.dhbwstuttgart.typeinference.unify.PlaceholderRegistry;
 import de.dhbwstuttgart.typeinference.unify.model.*;
 
+import java.lang.reflect.Modifier;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -54,7 +55,8 @@ public class FCGenerator {
     
     
     private static Boolean isFunctionalInterface(ClassOrInterface cly)	{
-    	return (cly.isInterface() && (cly.isFunctionalInterface() || cly.getMethods().size() == 1)); 
+        // TODO isFunctionalInterface should be set properly, we shouldn't need to check it again
+        return (cly.isInterface() && (cly.isFunctionalInterface() || cly.getMethods().size() == 1 && Modifier.isAbstract(cly.getMethods().getFirst().modifier)));
     }
     
     private static Pair genImplFunType(ClassOrInterface cly, RefTypeOrTPHOrWildcardOrGeneric fIType, HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> gtvs) {

src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java

@@ -405,14 +405,16 @@ public class StatementGenerator {
 
     private SwitchBlock convert(Java17Parser.SwitchBlockStatementGroupContext stmt) {
         List<SwitchLabel> labels = new ArrayList<>();
-        stmt.switchLabel().forEach((label) -> {
+        var isDefault = false;
+        for (var label : stmt.switchLabel()) {
+            if (label instanceof SwitchLabelDefaultContext) isDefault = true;
             labels.add(convert(label));
-        });
+        }
         List<Statement> block = new ArrayList<>();
         stmt.blockStatement().stream().forEach((blockStmt) -> {
             block.addAll(convert(blockStmt));
         });
-        return new SwitchBlock(labels, new Block(block, stmt.blockStatement(0).getStart()), false, stmt.getStart());
+        return new SwitchBlock(labels, new Block(block, stmt.blockStatement(0).getStart()), isDefault,false, stmt.getStart());
     }
 
     private SwitchLabel convert(SwitchLabelContext switchLabel) {
@@ -1033,10 +1035,22 @@ public class StatementGenerator {
     private Expression convert(Java17Parser.LiteralContext literal) {
         switch (literal) {
         case IntLiteralContext intliteral:
+            var text = intliteral.getText();
+            var radix = 10;
+            if (text.startsWith("0x") || text.startsWith("0X")) {
+                radix = 16;
+                text = text.substring(2);
+            } else if (text.startsWith("0b") || text.startsWith("0B")) {
+                radix = 2;
+                text = text.substring(2);
+            } else if (text.startsWith("0") && text.length() > 1) {
+                radix = 8;
+                text = text.substring(1);
+            }
             Number value;
-            if (intliteral.getText().endsWith("l") || intliteral.getText().endsWith("L"))
+            if (text.endsWith("l") || text.endsWith("L"))
-                value = Long.parseLong(intliteral.getText().substring(0, intliteral.getText().length() - 1));
+                value = Long.parseLong(text.substring(0, text.length() - 1), radix);
-            else value = Integer.parseInt(intliteral.getText());
+            else value = Integer.parseInt(text, radix);
             return new Literal(TypePlaceholder.fresh(literal.getStart()), value, intliteral.getStart());
         case FltLiteralContext floatliteral:
             if (floatliteral.getText().endsWith("f") || floatliteral.getText().endsWith("F"))

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

@@ -409,8 +409,9 @@ public class SyntaxTreeGenerator {
       }
     }
 
+    boolean isFunctonalInterfce = methods.size() == 1 && Modifier.isAbstract(methods.getFirst().modifier);
     var staticCtor = Optional.of(this.generateStaticConstructor(ctx.identifier().getText(), staticFieldInitializations, genericParams, ctx.getStart()));
-    return new ClassOrInterface(modifiers, name, fields, Optional.empty(), staticCtor, methods, new ArrayList<>(), genericParams, superClass, true, methods.size() == 1 ? true : false, extendedInterfaces, permittedSubtypes, ctx.getStart(), fileName);
+    return new ClassOrInterface(modifiers, name, fields, Optional.empty(), staticCtor, methods, new ArrayList<>(), genericParams, superClass, true, isFunctonalInterfce, extendedInterfaces, permittedSubtypes, ctx.getStart(), fileName);
   }
 
   private GenericDeclarationList createEmptyGenericDeclarationList(Token classNameIdentifier) {

src/main/java/de/dhbwstuttgart/target/generate/StatementToTargetExpression.java

@@ -476,7 +476,7 @@ public class StatementToTargetExpression implements ASTVisitor {
                     .map(this::extractAllPatterns)
                     .flatMap(List::stream).toList();
             case FormalParameter param -> List.of(new TypeVariants(param.getType(), converter.findAllVariants(param.getType())));
-            default -> List.of();
+            case null, default -> List.of();
         };
     }
 

src/test/java/TestComplete.java

@@ -1230,6 +1230,10 @@ public class TestComplete {
         assertEquals('C', clazz.getDeclaredMethod("m2").invoke(instance));
         assertEquals(10L, clazz.getDeclaredMethod("m3").invoke(instance));
         assertEquals(10.5F, clazz.getDeclaredMethod("m4").invoke(instance));
+        assertEquals(10.5D, clazz.getDeclaredMethod("m5").invoke(instance));
+        assertEquals(0xFF, clazz.getDeclaredMethod("m6").invoke(instance));
+        assertEquals(0b101010, clazz.getDeclaredMethod("m7").invoke(instance));
+        assertEquals(010, clazz.getDeclaredMethod("m8").invoke(instance));
     }
 
     @Test
@@ -1755,4 +1759,20 @@ public class TestComplete {
         assertEquals("one", name.invoke(instance, 1));
         assertEquals("many", name.invoke(instance, 2));
     }
+
+    @Test
+    public void testBug411() throws Exception {
+        var classFiles = generateClassFiles(createClassLoader(), "Bug411.jav");
+        var clazz = classFiles.get("Bug411");
+    }
+
+    @Test
+    public void testBug412() throws Exception {
+        var classFiles = generateClassFiles(createClassLoader(), "Bug412.jav");
+        var clazz = classFiles.get("Bug412");
+        var instance = clazz.getDeclaredConstructor().newInstance();
+        var m = clazz.getDeclaredMethod("m", Integer.class);
+        assertEquals(10, m.invoke(instance, 1));
+        assertEquals(20, m.invoke(instance, 2));
+    }
 }