Compare commits

..
Author SHA1 Message Date
dholle e70f071c63 Fix tests
SonarQube Scan / SonarQube Trigger (push) Failing after 1m28s
2026-09-30 19:22:21 +02:00
dholle f66499b4fe Revert "Update"
SonarQube Scan / SonarQube Trigger (push) Failing after 3m27s
This reverts commit eb05d22735.
2026-09-29 18:01:44 +02:00
3 changed files with 10 additions and 30 deletions

No files matched your search

-8
View File
@@ -1,8 +0,0 @@
sealed interface Interface permits A, B {}
public record A() implements Interface {}
public record B() implements Interface {}
public interface Matcher {
default match(A()@a) { return 0; }
default match(B()@b) { return 1; }
}
@@ -1,12 +0,0 @@
import java.lang.Integer;
import Matcher;
import Interface;
public class M implements Matcher {}
public class PatternMatchingInterface {
public static match(matcher, v) {
return matcher.match(v);
}
}
@@ -618,7 +618,7 @@ public class ASTToTargetAST {
} }
} }
private static TargetExpression generateCall(TargetMethod method, List<TargetLocalVar> params, TargetType classType, boolean isInterface) { private static TargetExpression generateCall(TargetMethod method, List<TargetLocalVar> params, TargetType classType) {
var mParams = new ArrayList<TargetExpression>(); var mParams = new ArrayList<TargetExpression>();
for (var i = 0; i < params.size(); i++) { for (var i = 0; i < params.size(); i++) {
var tpe = method.signature().parameters().get(i).pattern().type(); var tpe = method.signature().parameters().get(i).pattern().type();
@@ -626,11 +626,11 @@ public class ASTToTargetAST {
} }
TargetExpression caseBody = new TargetMethodCall( TargetExpression caseBody = new TargetMethodCall(
method.signature().returnType(), method.signature().returnType(),
method.isStatic() ? new TargetClassName(classType) : new TargetThis(classType), new TargetThis(classType),
mParams, mParams,
classType, classType,
method.name(), method.name(),
method.isStatic(), isInterface, method.isPrivate() false, false, method.isPrivate()
); );
if (method.signature().returnType() != null) { if (method.signature().returnType() != null) {
caseBody = new TargetReturn(caseBody); caseBody = new TargetReturn(caseBody);
@@ -638,11 +638,11 @@ public class ASTToTargetAST {
return caseBody; return caseBody;
} }
private TargetExpression generatePatternOverloadsRec(int offset, TargetExpression switchExpr, List<TargetLocalVar> params, List<TargetPattern> patterns, List<TargetMethod> methods, TargetType classType, boolean isInterface) { private TargetExpression generatePatternOverloadsRec(int offset, TargetExpression switchExpr, List<TargetLocalVar> params, List<TargetPattern> patterns, List<TargetMethod> methods, TargetType classType) {
if (methods.isEmpty()) throw new DebugException("Couldn't find a candidate for switch overloading"); if (methods.isEmpty()) throw new DebugException("Couldn't find a candidate for switch overloading");
if (methods.size() == 1) { if (methods.size() == 1) {
var method = methods.getFirst(); var method = methods.getFirst();
return generateCall(method, params, classType, isInterface); return generateCall(method, params, classType);
} }
var cases = new ArrayList<TargetSwitch.Case>(); var cases = new ArrayList<TargetSwitch.Case>();
@@ -691,11 +691,11 @@ public class ASTToTargetAST {
}).toList(); }).toList();
if (candidates.isEmpty()) { if (candidates.isEmpty()) {
var body = new TargetBlock(List.of(generateCall(method, params, classType, isInterface))); var body = new TargetBlock(List.of(generateCall(method, params, classType)));
cases.add(new TargetSwitch.Case(List.of(lastPattern), body)); cases.add(new TargetSwitch.Case(List.of(lastPattern), body));
} else { } else {
//candidates.forEach(m -> Target.logger.info(m.getSignature())); //candidates.forEach(m -> Target.logger.info(m.getSignature()));
var caseBody = generatePatternOverloadsRec(offset + 1, expr, params, patternsRec, candidates, classType, isInterface); var caseBody = generatePatternOverloadsRec(offset + 1, expr, params, patternsRec, candidates, classType);
var body = new TargetBlock(List.of(caseBody)); var body = new TargetBlock(List.of(caseBody));
var case_ = new TargetSwitch.Case(List.of(lastPattern), body); var case_ = new TargetSwitch.Case(List.of(lastPattern), body);
@@ -748,7 +748,7 @@ public class ASTToTargetAST {
private Optional<TargetMethod> generateBridgeMethod(ClassOrInterface clazz, List<TargetMethod> methods) { private Optional<TargetMethod> generateBridgeMethod(ClassOrInterface clazz, List<TargetMethod> methods) {
// If there's only one method we don't need a bridge // If there's only one method we don't need a bridge
//if (clazz.isInterface()) return Optional.empty(); if (clazz.isInterface()) return Optional.empty();
if (methods.size() <= 1) return Optional.empty(); if (methods.size() <= 1) return Optional.empty();
var firstMethod = methods.getFirst(); var firstMethod = methods.getFirst();
@@ -787,7 +787,7 @@ public class ASTToTargetAST {
var parameters = resParams.stream().map( p -> new TargetLocalVar(p.pattern().type(), p.pattern().name())).toList(); var parameters = resParams.stream().map( p -> new TargetLocalVar(p.pattern().type(), p.pattern().name())).toList();
var classType = new TargetRefType(clazz.getClassName().toString()); var classType = new TargetRefType(clazz.getClassName().toString());
var stmt = generatePatternOverloadsRec(0, new TargetLocalVar(resParams.getFirst().pattern().type(), resParams.getFirst().pattern().name()), parameters, List.of(), methods, classType, clazz.isInterface()); var stmt = generatePatternOverloadsRec(0, new TargetLocalVar(resParams.getFirst().pattern().type(), resParams.getFirst().pattern().name()), parameters, List.of(), methods, classType);
var block = new TargetBlock(List.of(stmt)); var block = new TargetBlock(List.of(stmt));
var generics = new HashSet<>(firstMethod.signature().generics()); var generics = new HashSet<>(firstMethod.signature().generics());
@@ -870,7 +870,7 @@ public class ASTToTargetAST {
// Generate dispatch method // Generate dispatch method
var classType = new TargetRefType(clazz.getClassName().toString()); var classType = new TargetRefType(clazz.getClassName().toString());
var stmt = generatePatternOverloadsRec(0, new TargetLocalVar(signatureParams.getFirst().pattern().type(), signatureParams.getFirst().pattern().name()), parameters, List.of(), res, classType, clazz.isInterface()); var stmt = generatePatternOverloadsRec(0, new TargetLocalVar(signatureParams.getFirst().pattern().type(), signatureParams.getFirst().pattern().name()), parameters, List.of(), res, classType);
var block = new TargetBlock(List.of(stmt)); var block = new TargetBlock(List.of(stmt));
var bridgeMethod = new TargetMethod(firstMethod.access(), firstMethod.name(), block, group.signature.java, group.signature.tx, firstMethod.base(), null); var bridgeMethod = new TargetMethod(firstMethod.access(), firstMethod.name(), block, group.signature.java, group.signature.tx, firstMethod.base(), null);