Compare commits

..
2 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
14 changed files with 55 additions and 29 deletions

No files matched your search

+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;
}
}
+4 -7
View File
@@ -13,15 +13,15 @@ public sealed interface LazyList permits Empty, Cons {
public Integer fst(); public Integer fst();
public LazyList rest(); public LazyList rest();
} }
/*
public class Filter { public class Filter {
public LazyList filter(Fun1$$<Integer, Boolean> p, LazyList l) { /*public LazyList filter(Fun1$$<Integer, Boolean> p, LazyList l) {
return switch(l) { return switch(l) {
case Empty e -> e; case Empty e -> e;
case Cons(Integer x, Supplier<LazyList> l1) -> case Cons(Integer x, Supplier<LazyList> l1) ->
p.apply(x) ? new Cons(x, () -> filter(p, l1.get())) : filter(p, l1.get()); p.apply(x) ? new Cons(x, () -> filter(p, l1.get())) : filter(p, l1.get());
}; };
} }*/
public LazyList filter(Fun1$$<Integer, Boolean> p, Empty()@l) { public LazyList filter(Fun1$$<Integer, Boolean> p, Empty()@l) {
return l; return l;
} }
@@ -31,8 +31,6 @@ public class Filter {
} }
} }
*/
//Der Konstruktor Cons muss lazy sein, deshalb hier Supplier<...> //Der Konstruktor Cons muss lazy sein, deshalb hier Supplier<...>
record Cons(Integer x, Fun0$$<LazyList> l) implements LazyList { record Cons(Integer x, Fun0$$<LazyList> l) implements LazyList {
public Integer fst() { return this.x; } public Integer fst() { return this.x; }
@@ -47,7 +45,7 @@ record Empty() implements LazyList {
public LazyList rest() { return null; } public LazyList rest() { return null; }
} }
/*
class Main { class Main {
static LazyList Count(int i) { return new Cons(i, () -> Count(i+1)); } static LazyList Count(int i) { return new Cons(i, () -> Count(i+1)); }
@@ -56,4 +54,3 @@ class Main {
System.out.println(Count(1).rest().fst()); System.out.println(Count(1).rest().fst());
} }
} }
*/
+7 -8
View File
@@ -7,10 +7,9 @@ import java.io.PrintStream;
import LazyList; import LazyList;
import Cons; import Cons;
import Empty; import Empty;
//import Filter; import Filter;
public class Primzahlen { public class Primzahlen {
/*
static LazyList from(Integer i) { return new Cons(i, () -> from(i+1)); } static LazyList from(Integer i) { return new Cons(i, () -> from(i+1)); }
/*LazyList filter(Fun1$$<Integer, Boolean> p, LazyList l) { /*LazyList filter(Fun1$$<Integer, Boolean> p, LazyList l) {
@@ -19,7 +18,7 @@ public class Primzahlen {
case Cons(Integer x, Fun0$$<LazyList> l1) -> case Cons(Integer x, Fun0$$<LazyList> l1) ->
p.apply(x) ? new Cons(x, () -> filter(p, l1.apply())) : filter(p, l1.apply()); p.apply(x) ? new Cons(x, () -> filter(p, l1.apply())) : filter(p, l1.apply());
}; };
} }*/
LazyList dropMul(Integer x, LazyList xs) { LazyList dropMul(Integer x, LazyList xs) {
return new Filter().filter(y -> (y % x != 0), xs); return new Filter().filter(y -> (y % x != 0), xs);
@@ -41,13 +40,13 @@ public class Primzahlen {
new Cons(x, () -> take(n-1, l1.apply())); new Cons(x, () -> take(n-1, l1.apply()));
}; };
}; };
*/
public static void main(args) { public static void main(args) {
//System.out.println(new Cons(1, () -> new Cons(2, () -> new Empty())).fst()); System.out.println(new Cons(1, () -> new Cons(2, () -> new Empty())).fst());
var l = new Cons(1, () -> new Cons(2, () -> new Cons(2, () -> new Empty()))); var l = new Cons(1, () -> new Cons(2, () -> new Cons(2, () -> new Empty())));
//System.out.println(l); System.out.println(l);
//var filtered = new Filter().filter(x -> x == 2, l); var filtered = new Filter().filter(x -> x == 2, l);
//ystem.out.println(filtered); System.out.println(filtered);
//System.out.println(from(1).rest().fst()); //System.out.println(from(1).rest().fst());
//Primzahlen pz = new Primzahlen(); //Primzahlen pz = new Primzahlen();
//System.out.println(pz.take(10, pz.from(2))); //System.out.println(pz.take(10, pz.from(2)));
@@ -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);
@@ -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());
} }
@@ -1111,7 +1114,7 @@ public class StatementGenerator {
if (expression.lambdaBody().expression() != null) { if (expression.lambdaBody().expression() != null) {
List<Statement> statements = new ArrayList<>(); List<Statement> statements = new ArrayList<>();
statements.add(new Return(lambdaGenerator.convert(expression.lambdaBody().expression()), expression.lambdaBody().expression().getStart())); statements.add(new Return(lambdaGenerator.convert(expression.lambdaBody().expression()), expression.lambdaBody().expression().getStart()));
block = new Block(statements, expression.lambdaBody().getStart(), -1); block = new Block(statements, expression.lambdaBody().getStart());
} else { } else {
block = lambdaGenerator.convert(expression.lambdaBody().block(), true); block = lambdaGenerator.convert(expression.lambdaBody().block(), true);
} }
@@ -14,11 +14,6 @@ public class Block extends Statement {
this.statements = statements; this.statements = statements;
} }
public Block(List<Statement> statements, Token offset, int variance) {
super(TypePlaceholder.fresh(offset, variance, true), offset);
this.statements = statements;
}
public List<Statement> statements = new ArrayList<>(); public List<Statement> statements = new ArrayList<>();
public List<Statement> getStatements() { public List<Statement> getStatements() {
@@ -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,
@@ -188,10 +188,8 @@ public class OutputGenerator implements ASTVisitor {
@Override @Override
public void visit(LambdaExpression lambdaExpression) { public void visit(LambdaExpression lambdaExpression) {
out.append("("); lambdaExpression.params.accept(this);
lambdaExpression.params.accept(this);
out.append(" -> "); out.append(" -> ");
out.append("(");
lambdaExpression.methodBody.accept(this); lambdaExpression.methodBody.accept(this);
} }
@@ -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 {
@@ -39,7 +39,6 @@ public class distributeVariance extends visitUnifyTypeVisitor<Integer> {
List<UnifyType> param = new ArrayList<>(funnty.getTypeParams().get().length); List<UnifyType> param = new ArrayList<>(funnty.getTypeParams().get().length);
param.addAll(Arrays.asList(funnty.getTypeParams().get())); param.addAll(Arrays.asList(funnty.getTypeParams().get()));
UnifyType resultType = param.remove(param.size()-1); UnifyType resultType = param.remove(param.size()-1);
ht = (ht == 0)? 1 : 0; //bei ht = 0 wird ht auf die Standardwerte für Functionstypes gesetzt
int htInverse = inverseVariance(ht); int htInverse = inverseVariance(ht);
param = param.stream() param = param.stream()
.map(x -> x.accept(this, htInverse)) .map(x -> x.accept(this, htInverse))
+14 -2
View File
@@ -257,7 +257,6 @@ public class TestComplete {
@Test @Test
//@Disabled("This is too complex") //@Disabled("This is too complex")
public void matrixTest() throws Exception { public void matrixTest() throws Exception {
//ConsoleInterface.logLevel = LogLevel.DEBUG;
var classFiles = generateClassFiles(createClassLoader(), "Matrix.jav"); var classFiles = generateClassFiles(createClassLoader(), "Matrix.jav");
var matrix = classFiles.get("Matrix"); var matrix = classFiles.get("Matrix");
@@ -1360,7 +1359,6 @@ public class TestComplete {
@Disabled("See #405") @Disabled("See #405")
@Test @Test
public void testLazy() throws Exception { public void testLazy() throws Exception {
ConsoleInterface.logLevel = LogLevel.DEBUG;
var classFiles = generateClassFiles(createClassLoader(), false, "LazyList.jav", "Primzahlen.jav"); var classFiles = generateClassFiles(createClassLoader(), false, "LazyList.jav", "Primzahlen.jav");
var clazz = classFiles.get("Primzahlen"); var clazz = classFiles.get("Primzahlen");
var main = clazz.getDeclaredMethod("main", List.class); var main = clazz.getDeclaredMethod("main", List.class);
@@ -1794,4 +1792,18 @@ public class TestComplete {
var len = clazz.getDeclaredMethod("len", L); var len = clazz.getDeclaredMethod("len", L);
assertEquals(3, len.invoke(null, list)); 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"))))));