Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c63f1acce5 | ||
|
|
c06079058e | ||
|
|
e1b9766a53 | ||
|
|
35e8dda6bd | ||
|
|
bf22cf246e | ||
|
|
034cdf2e0b | ||
|
|
95ee84cb99 | ||
|
|
3fc098b155 | ||
|
|
32ddb1132f | ||
|
|
174c999543 | ||
|
|
942b8ca488 |
No files matched your search
@@ -0,0 +1,7 @@
|
||||
import java.lang.Integer;
|
||||
|
||||
public interface Bug411 {
|
||||
default f() {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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; }
|
||||
}
|
||||
@@ -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 -> {
|
||||
generate(state, not.expr());
|
||||
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)) {
|
||||
mv.visitLdcInsn(-1L);
|
||||
mv.visitInsn(LXOR);
|
||||
@@ -1780,7 +1787,7 @@ public class Codegen {
|
||||
if (parent != null) {
|
||||
state.scope.parent = parent.scope;
|
||||
}
|
||||
var offset = 1;
|
||||
var offset = method.isStatic() ? 0 : 1;
|
||||
for (var param : method.signature().parameters()) {
|
||||
state.createVariable(param.pattern().name(), param.pattern().type());
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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) {
|
||||
@@ -985,6 +987,9 @@ public class StatementGenerator {
|
||||
} else if (op.getText().equals("-")) {
|
||||
ret = new UnaryExpr(UnaryExpr.Operation.MINUS, expr, TypePlaceholder.fresh(op), op);
|
||||
return ret;
|
||||
} else if (op.getText().equals("~")) {
|
||||
ret = new UnaryExpr(UnaryExpr.Operation.BNOT, expr, TypePlaceholder.fresh(op), op);
|
||||
return ret;
|
||||
} else {
|
||||
throw new NotImplementedException(op.getText());
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -10,6 +10,7 @@ import org.antlr.v4.runtime.Token;
|
||||
public class UnaryExpr extends JavaInternalExpression
|
||||
{
|
||||
public enum Operation{
|
||||
BNOT,
|
||||
NOT,
|
||||
MINUS,
|
||||
PREINCREMENT,
|
||||
|
||||
@@ -29,6 +29,7 @@ import org.objectweb.asm.Opcodes;
|
||||
|
||||
import java.lang.classfile.Opcode;
|
||||
import java.lang.reflect.AccessFlag;
|
||||
import java.lang.reflect.Modifier;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
@@ -630,7 +631,7 @@ public class ASTToTargetAST {
|
||||
mParams,
|
||||
classType,
|
||||
method.name(),
|
||||
false, false, method.isPrivate()
|
||||
method.isStatic(), false, method.isPrivate()
|
||||
);
|
||||
if (method.signature().returnType() != null) {
|
||||
caseBody = new TargetReturn(caseBody);
|
||||
|
||||
@@ -425,6 +425,7 @@ public class StatementToTargetExpression implements ASTVisitor {
|
||||
@Override
|
||||
public void visit(UnaryExpr unaryExpr) {
|
||||
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 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));
|
||||
@@ -476,7 +477,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();
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@ public sealed interface TargetUnaryOp extends TargetExpression {
|
||||
|
||||
record Negate(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 PreIncrement(TargetType type, TargetExpression expr) implements TargetStatementExpression, TargetUnaryOp {}
|
||||
|
||||
@@ -254,7 +254,7 @@ public class TYPEStmt implements StatementVisitor {
|
||||
} 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(), 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(), unaryExpr.getType(), PairOperator.EQUALSDOT, loc(unaryExpr.getOffset())));
|
||||
} else {
|
||||
|
||||
@@ -1759,4 +1759,51 @@ 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));
|
||||
}
|
||||
|
||||
@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));
|
||||
}
|
||||
}
|
||||
@@ -143,7 +143,7 @@ public class TestCodegen {
|
||||
public void testUnary() throws Exception {
|
||||
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, "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"))))));
|
||||
|
||||
|
||||
Reference in new issue
Block a user