Compare commits

...
5 Commits
Author SHA1 Message Date
dholle c63f1acce5 Implement binary not
Build and Test with Maven / Build-and-test-with-Maven (push) Successful in 1m17s
SonarQube Scan / SonarQube Trigger (pull_request) Successful in 2m27s
2026-11-17 11:22:39 +01:00
dholle c06079058e Fix #436
Build and Test with Maven / Build-and-test-with-Maven (push) Failing after 1m56s
SonarQube Scan / SonarQube Trigger (pull_request) Failing after 1m31s
2026-11-17 10:59:28 +01:00
dholle e1b9766a53 Merge pull request 'Fix various issues with static methods, fixes #416' (#433) from fix-416 into master
SonarQube Scan / SonarQube Trigger (push) Successful in 2m38s
Reviewed-on: #433
2026-11-11 16:51:45 +00:00
dholle 35e8dda6bd Fix various issues with static methods, fixes #416
Build and Test with Maven / Build-and-test-with-Maven (push) Successful in 2m7s
SonarQube Scan / SonarQube Trigger (pull_request) Canceled after 16m22s
2026-11-11 17:32:58 +01:00
dholle bf22cf246e Merge pull request 'Fix #411 by setting functional interface property properly' (#431) from fix-411 into master
SonarQube Scan / SonarQube Trigger (push) Successful in 3m27s
Reviewed-on: #431
2026-11-11 15:43:24 +00:00
11 changed files with 71 additions and 4 deletions

No files matched your search

+9
View File
@@ -0,0 +1,9 @@
import java.lang.Integer;
sealed interface L<T> permits Cons, Nil {}
public record Cons<T>(T head, L<T> tail) implements L<T> {}
public record Nil<T>() implements L<T> {}
public class Bug416 {
public static <T> len(Cons(h, t)) { return 1 + len(t); }
public static <T> len(Nil()) { return 0; }
}
+13
View File
@@ -0,0 +1,13 @@
import java.lang.Boolean;
import java.lang.Integer;
import java.lang.System;
import java.io.PrintStream;
public class Bug436 {
public not(Boolean b) {
return !b;
}
public not(Integer i) {
return ~i;
}
}
@@ -735,6 +735,13 @@ public class Codegen {
case TargetUnaryOp.Not not -> { case TargetUnaryOp.Not not -> {
generate(state, not.expr()); generate(state, not.expr());
convertTo(state, not.expr().type(), TargetType.boolean_); convertTo(state, not.expr().type(), TargetType.boolean_);
mv.visitInsn(ICONST_1);
mv.visitInsn(IXOR);
boxPrimitive(state, TargetType.toPrimitive(not.expr().type()));
}
case TargetUnaryOp.BNot not -> {
generate(state, not.expr());
convertTo(state, not.expr().type(), TargetType.toPrimitive(not.expr().type()));
if (not.type().equals(TargetType.Long)) { if (not.type().equals(TargetType.Long)) {
mv.visitLdcInsn(-1L); mv.visitLdcInsn(-1L);
mv.visitInsn(LXOR); mv.visitInsn(LXOR);
@@ -1780,7 +1787,7 @@ public class Codegen {
if (parent != null) { if (parent != null) {
state.scope.parent = parent.scope; state.scope.parent = parent.scope;
} }
var offset = 1; var offset = method.isStatic() ? 0 : 1;
for (var param : method.signature().parameters()) { for (var param : method.signature().parameters()) {
state.createVariable(param.pattern().name(), param.pattern().type()); state.createVariable(param.pattern().name(), param.pattern().type());
} }
@@ -987,6 +987,9 @@ public class StatementGenerator {
} else if (op.getText().equals("-")) { } else if (op.getText().equals("-")) {
ret = new UnaryExpr(UnaryExpr.Operation.MINUS, expr, TypePlaceholder.fresh(op), op); ret = new UnaryExpr(UnaryExpr.Operation.MINUS, expr, TypePlaceholder.fresh(op), op);
return ret; return ret;
} else if (op.getText().equals("~")) {
ret = new UnaryExpr(UnaryExpr.Operation.BNOT, expr, TypePlaceholder.fresh(op), op);
return ret;
} else { } else {
throw new NotImplementedException(op.getText()); throw new NotImplementedException(op.getText());
} }
@@ -10,6 +10,7 @@ import org.antlr.v4.runtime.Token;
public class UnaryExpr extends JavaInternalExpression public class UnaryExpr extends JavaInternalExpression
{ {
public enum Operation{ public enum Operation{
BNOT,
NOT, NOT,
MINUS, MINUS,
PREINCREMENT, PREINCREMENT,
@@ -29,6 +29,7 @@ import org.objectweb.asm.Opcodes;
import java.lang.classfile.Opcode; import java.lang.classfile.Opcode;
import java.lang.reflect.AccessFlag; import java.lang.reflect.AccessFlag;
import java.lang.reflect.Modifier;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@@ -630,7 +631,7 @@ public class ASTToTargetAST {
mParams, mParams,
classType, classType,
method.name(), method.name(),
false, false, method.isPrivate() method.isStatic(), false, method.isPrivate()
); );
if (method.signature().returnType() != null) { if (method.signature().returnType() != null) {
caseBody = new TargetReturn(caseBody); caseBody = new TargetReturn(caseBody);
@@ -425,6 +425,7 @@ public class StatementToTargetExpression implements ASTVisitor {
@Override @Override
public void visit(UnaryExpr unaryExpr) { public void visit(UnaryExpr unaryExpr) {
result = switch (unaryExpr.operation) { result = switch (unaryExpr.operation) {
case BNOT -> new TargetUnaryOp.BNot(converter.convert(unaryExpr.getType(), generics), converter.convert(unaryExpr.expr, generics));
case NOT -> new TargetUnaryOp.Not(converter.convert(unaryExpr.getType(), generics), converter.convert(unaryExpr.expr, generics)); case NOT -> new TargetUnaryOp.Not(converter.convert(unaryExpr.getType(), generics), converter.convert(unaryExpr.expr, generics));
case MINUS -> new TargetUnaryOp.Negate(converter.convert(unaryExpr.getType(), generics), converter.convert(unaryExpr.expr, generics)); case MINUS -> new TargetUnaryOp.Negate(converter.convert(unaryExpr.getType(), generics), converter.convert(unaryExpr.expr, generics));
case PREINCREMENT -> new TargetUnaryOp.PreIncrement(converter.convert(unaryExpr.getType(), generics), converter.convert(unaryExpr.expr, generics)); case PREINCREMENT -> new TargetUnaryOp.PreIncrement(converter.convert(unaryExpr.getType(), generics), converter.convert(unaryExpr.expr, generics));
@@ -7,6 +7,7 @@ public sealed interface TargetUnaryOp extends TargetExpression {
record Negate(TargetType type, TargetExpression expr) implements TargetUnaryOp {} record Negate(TargetType type, TargetExpression expr) implements TargetUnaryOp {}
record Add(TargetType type, TargetExpression expr) implements TargetUnaryOp {} record Add(TargetType type, TargetExpression expr) implements TargetUnaryOp {}
record BNot(TargetType type, TargetExpression expr) implements TargetUnaryOp {}
record Not(TargetType type, TargetExpression expr) implements TargetUnaryOp {} record Not(TargetType type, TargetExpression expr) implements TargetUnaryOp {}
record PreIncrement(TargetType type, TargetExpression expr) implements TargetStatementExpression, TargetUnaryOp {} record PreIncrement(TargetType type, TargetExpression expr) implements TargetStatementExpression, TargetUnaryOp {}
@@ -254,7 +254,7 @@ public class TYPEStmt implements StatementVisitor {
} else if (unaryExpr.operation == UnaryExpr.Operation.NOT) { } else if (unaryExpr.operation == UnaryExpr.Operation.NOT) {
constraintsSet.addUndConstraint(new Pair(unaryExpr.expr.getType(), unaryExpr.getType(), PairOperator.EQUALSDOT, loc(unaryExpr.getOffset()))); constraintsSet.addUndConstraint(new Pair(unaryExpr.expr.getType(), unaryExpr.getType(), PairOperator.EQUALSDOT, loc(unaryExpr.getOffset())));
constraintsSet.addUndConstraint(new Pair(unaryExpr.expr.getType(), new RefType(ASTFactory.createClass(java.lang.Boolean.class).getClassName(), new NullToken()), PairOperator.EQUALSDOT, loc(unaryExpr.getOffset()))); constraintsSet.addUndConstraint(new Pair(unaryExpr.expr.getType(), new RefType(ASTFactory.createClass(java.lang.Boolean.class).getClassName(), new NullToken()), PairOperator.EQUALSDOT, loc(unaryExpr.getOffset())));
} else if (unaryExpr.operation == UnaryExpr.Operation.MINUS) { } else if (unaryExpr.operation == UnaryExpr.Operation.MINUS || unaryExpr.operation == UnaryExpr.Operation.BNOT) {
constraintsSet.addUndConstraint(new Pair(unaryExpr.expr.getType(), number, PairOperator.SMALLERDOT, loc(unaryExpr.getOffset()))); constraintsSet.addUndConstraint(new Pair(unaryExpr.expr.getType(), number, PairOperator.SMALLERDOT, loc(unaryExpr.getOffset())));
constraintsSet.addUndConstraint(new Pair(unaryExpr.expr.getType(), unaryExpr.getType(), PairOperator.EQUALSDOT, loc(unaryExpr.getOffset()))); constraintsSet.addUndConstraint(new Pair(unaryExpr.expr.getType(), unaryExpr.getType(), PairOperator.EQUALSDOT, loc(unaryExpr.getOffset())));
} else { } else {
+31
View File
@@ -1775,4 +1775,35 @@ public class TestComplete {
assertEquals(10, m.invoke(instance, 1)); assertEquals(10, m.invoke(instance, 1));
assertEquals(20, m.invoke(instance, 2)); assertEquals(20, m.invoke(instance, 2));
} }
@Test
public void testBug416() throws Exception {
var classFiles = generateClassFiles(createClassLoader(), "Bug416.jav");
var clazz = classFiles.get("Bug416");
var L = classFiles.get("L");
var Cons = classFiles.get("Cons");
var Nil = classFiles.get("Nil");
var consCtor = Cons.getDeclaredConstructor(Object.class, L);
var nilCtor = Nil.getDeclaredConstructor();
var list = consCtor.newInstance(1, consCtor.newInstance(2, consCtor.newInstance(3, nilCtor.newInstance())));
var len = clazz.getDeclaredMethod("len", L);
assertEquals(3, len.invoke(null, list));
}
@Test
public void testBug436() throws Exception {
var classFiles = generateClassFiles(createClassLoader(), "Bug436.jav");
var clazz = classFiles.get("Bug436");
var instance = clazz.getDeclaredConstructor().newInstance();
var not = clazz.getDeclaredMethod("not", Boolean.class);
assertEquals(false, not.invoke(instance, true));
assertEquals(true, not.invoke(instance, false));
var bnot = clazz.getDeclaredMethod("not", Integer.class);
assertEquals(-11, bnot.invoke(instance, 10));
}
} }
+1 -1
View File
@@ -143,7 +143,7 @@ public class TestCodegen {
public void testUnary() throws Exception { public void testUnary() throws Exception {
var targetClass = new TargetClass(Opcodes.ACC_PUBLIC, new JavaClassName("Unary")); var targetClass = new TargetClass(Opcodes.ACC_PUBLIC, new JavaClassName("Unary"));
targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "not", List.of(new MethodParameter(TargetType.Integer, "a")), TargetType.Integer, new TargetBlock(List.of(new TargetReturn(new TargetUnaryOp.Not(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "a")))))); targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "not", List.of(new MethodParameter(TargetType.Integer, "a")), TargetType.Integer, new TargetBlock(List.of(new TargetReturn(new TargetUnaryOp.BNot(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "a"))))));
targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "neg", List.of(new MethodParameter(TargetType.Integer, "a")), TargetType.Integer, new TargetBlock(List.of(new TargetReturn(new TargetUnaryOp.Negate(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "a")))))); targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "neg", List.of(new MethodParameter(TargetType.Integer, "a")), TargetType.Integer, new TargetBlock(List.of(new TargetReturn(new TargetUnaryOp.Negate(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "a"))))));
targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "add", List.of(new MethodParameter(TargetType.Integer, "a")), TargetType.Integer, new TargetBlock(List.of(new TargetReturn(new TargetUnaryOp.Add(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "a")))))); targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "add", List.of(new MethodParameter(TargetType.Integer, "a")), TargetType.Integer, new TargetBlock(List.of(new TargetReturn(new TargetUnaryOp.Add(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "a"))))));