| Chunk |
|---|
| Conflicting content |
|---|
* wycs.solver.smt.Stmt.DefineSort} and {@link wycs.solver.smt.Stmt.Assert}s. Doing this means
* we don't have to manually check for their existence and ensures they are uniquely defined.
*/
<<<<<<< HEAD
private final Set |
| Solution content |
|---|
* wycs.solver.smt.Stmt.DefineSort} and {@link wycs.solver.smt.Stmt.Assert}s. Doing this means
* we don't have to manually check for their existence and ensures they are uniquely defined.
*/
private final Set |
| File |
|---|
| Block.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
* wycs.solver.smt.Stmt.DefineSort} and {@link wycs.solver.smt.Stmt.Assert}s. Doing this means
* we don't have to manually check for their existence and ensures they are uniquely defined.
*/
<<<<<<< HEAD
private final Set |
| Solution content |
|---|
* wycs.solver.smt.Stmt.DefineSort} and {@link wycs.solver.smt.Stmt.Assert}s. Doing this means
* we don't have to manually check for their existence and ensures they are uniquely defined.
*/
private final Set |
| File |
|---|
| Smt2File.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
* {@inheritDoc}
*/
@Override
<<<<<<< HEAD
public List |
| Solution content |
|---|
* {@inheritDoc}
*/
@Override
public List |
| File |
|---|
| Sort.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Method signature |
| Return statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
return "(" + getName() + " " + type + ")";
}
<<<<<<< HEAD
private List |
| Solution content |
|---|
return "(" + getName() + " " + type + ")";
}
private List |
| File |
|---|
| Sort.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Method signature |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
expr));
}
<<<<<<< HEAD
private List |
| Solution content |
|---|
expr));
}
private List |
| File |
|---|
| Sort.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Method signature |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
expr));
}
<<<<<<< HEAD
private List |
| Solution content |
|---|
expr));
}
private List |
| File |
|---|
| Sort.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Method signature |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
return stmts;
}
<<<<<<< HEAD
private List |
| Solution content |
|---|
return stmts;
}
private List |
| File |
|---|
| Sort.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Method declaration |
| Method invocation |
| Method signature |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
return stmts;
}
<<<<<<< HEAD
private List |
| Solution content |
|---|
return stmts;
}
private List |
| File |
|---|
| Sort.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Method signature |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
expr));
}
<<<<<<< HEAD
private List |
| Solution content |
|---|
expr));
}
private List |
| File |
|---|
| Sort.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method declaration |
| Method invocation |
| Method signature |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
// Alternative that uses the length function
// String subsetExpr = "(and (subseteq first second) (distinct (length first) (length second)))";
<<<<<<< HEAD
List |
| Solution content |
|---|
// Alternative that uses the length function
// String subsetExpr = "(and (subseteq first second) (distinct (length first) (length second)))";
List |
| File |
|---|
| Sort.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
throw new NullPointerException("types cannot contain null");
}
<<<<<<< HEAD
this.types = Collections.unmodifiableList(new ArrayList<>(types));
=======
this.types = new ArrayList |
| Solution content |
|---|
throw new NullPointerException("types cannot contain null");
}
this.types = Collections.unmodifiableList(new ArrayList<>(types));
}
public static String generateGetFunctionName(int index) { |
| File |
|---|
| Sort.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
* {@inheritDoc}
*/
@Override
<<<<<<< HEAD
public List |
| Solution content |
|---|
* {@inheritDoc}
*/
@Override
public List |
| File |
|---|
| Sort.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Method signature |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
return sb.toString();
}
<<<<<<< HEAD
private List |
| Solution content |
|---|
return sb.toString();
}
private List |
| File |
|---|
| Sort.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method declaration |
| Method invocation |
| Method signature |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
this.name = name;
this.returnSort = returnSort;
<<<<<<< HEAD
this.parameterSorts = Collections.unmodifiableList(new ArrayList<>(parameterSorts));
=======
this.parameterSorts = new ArrayList |
| Solution content |
|---|
this.name = name;
this.returnSort = returnSort;
this.parameterSorts = Collections.unmodifiableList(new ArrayList<>(parameterSorts));
}
/** |
| File |
|---|
| Stmt.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
this.name = name;
this.returnSort = returnSort;
<<<<<<< HEAD
this.parameters = Collections.unmodifiableList(new ArrayList<>(parameters));
=======
this.parameters = new ArrayList |
| Solution content |
|---|
this.name = name;
this.returnSort = returnSort;
this.parameters = Collections.unmodifiableList(new ArrayList<>(parameters));
this.expr = expr;
}
|
| File |
|---|
| Stmt.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
}
this.name = name;
<<<<<<< HEAD
this.parameters = Collections.unmodifiableList(new ArrayList<>(parameters));
=======
this.parameters = new ArrayList |
| Solution content |
|---|
}
this.name = name;
this.parameters = Collections.unmodifiableList(new ArrayList<>(parameters));
this.expr = expr;
}
|
| File |
|---|
| Stmt.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
// Recursion potential here! Skip if we've already generated the declaration and assertion
<<<<<<< HEAD
// A function can be uniquely identified by it's identifier and generic binding
if (!functions.contains(new Pair<>(id, generics))) {
functions.add(new Pair<>(id, generics));
// Generate the uninterpreted function declaration
List |
| Solution content |
|---|
// Recursion potential here! Skip if we've already generated the declaration and assertion
// A function can be uniquely identified by it's identifier and generic binding
if (!functions.contains(new Pair<>(id, generics))) {
functions.add(new Pair<>(id, generics));
// Generate the uninterpreted function declaration
List |
| File |
|---|
| SmtVerificationCheck.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
if (!(code instanceof Code.Quantifier)) {
// Guess not, let's negate it and check for UNSAT anyway as UNSAT is easier for a solver
// to determine (and lets our length function work properly)
<<<<<<< HEAD
return new Pair<>("(not " + translate(code) + ")", Response.UNSAT);
=======
return new Pair("(not " + translate(code) + ")", Result.UNSAT);
>>>>>>> 42fbb6029086e408635853543bd4a125b28b8123
}
Code.Quantifier quantifier = (Code.Quantifier) code; |
| Solution content |
|---|
if (!(code instanceof Code.Quantifier)) {
// Guess not, let's negate it and check for UNSAT anyway as UNSAT is easier for a solver
// to determine (and lets our length function work properly)
return new Pair<>("(not " + translate(code) + ")", Response.UNSAT);
}
Code.Quantifier quantifier = (Code.Quantifier) code; |
| File |
|---|
| SmtVerificationCheck.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Return statement |
| Chunk |
|---|
| Conflicting content |
|---|
// declare-sort x
// assert a and b and c
if (code.opcode == Code.Op.EXISTS) {
<<<<<<< HEAD
return new Pair<>(translate(operand), Response.SAT);
=======
return new Pair(translate(operand), Result.SAT);
>>>>>>> 42fbb6029086e408635853543bd4a125b28b8123
}
// Opcode must be a FORALL |
| Solution content |
|---|
// declare-sort x
// assert a and b and c
if (code.opcode == Code.Op.EXISTS) {
return new Pair<>(translate(operand), Response.SAT);
}
// Opcode must be a FORALL |
| File |
|---|
| SmtVerificationCheck.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Return statement |
| Chunk |
|---|
| Conflicting content |
|---|
// If it doesn't happen to be an OR, then we can still translate it treating it as if it
// were an or of a single term
if (operand.opcode != Code.Op.OR) {
<<<<<<< HEAD
return new Pair<>("(not " + translate(operand) + ")", Response.UNSAT);
=======
return new Pair("(not " + translate(operand) + ")", Result.UNSAT);
>>>>>>> 42fbb6029086e408635853543bd4a125b28b8123
}
// Looks like the FORALL is over an OR (or implication), got to add the negated premises |
| Solution content |
|---|
// If it doesn't happen to be an OR, then we can still translate it treating it as if it
// were an or of a single term
if (operand.opcode != Code.Op.OR) {
return new Pair<>("(not " + translate(operand) + ")", Response.UNSAT);
}
// Looks like the FORALL is over an OR (or implication), got to add the negated premises |
| File |
|---|
| SmtVerificationCheck.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Return statement |
| Chunk |
|---|
| Conflicting content |
|---|
String expr = translate(operand.operands[operand.operands.length - 1]);
expr = "(not " + expr + ")";
<<<<<<< HEAD
return new Pair<>(expr, Response.UNSAT);
=======
return new Pair(expr, Result.UNSAT);
>>>>>>> 42fbb6029086e408635853543bd4a125b28b8123
}
private String translateSet(Code.Nary code) { |
| Solution content |
|---|
String expr = translate(operand.operands[operand.operands.length - 1]);
expr = "(not " + expr + ")";
return new Pair<>(expr, Response.UNSAT);
}
private String translateSet(Code.Nary code) { |
| File |
|---|
| SmtVerificationCheck.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Return statement |
| Chunk |
|---|
| Conflicting content |
|---|
private File write() throws IOException {
// Prepare the output destination
File out = File.createTempFile("wycs_" + wycsFile.id() + "_", ".smt2");
<<<<<<< HEAD
=======
if (!out.exists()) {
throw new IOException("unable to create temp file: " + smt2File);
}
>>>>>>> 42fbb6029086e408635853543bd4a125b28b8123
if (!DEBUG) {
out.deleteOnExit();
} |
| Solution content |
|---|
private File write() throws IOException {
// Prepare the output destination
File out = File.createTempFile("wycs_" + wycsFile.id() + "_", ".smt2");
if (!DEBUG) {
out.deleteOnExit();
} |
| File |
|---|
| SmtVerificationCheck.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |