DASCA
/
WALA
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug fixes 

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@1488 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
sjfink 2007-07-16 17:06:15 +00:00
parent 1f42098a1e
commit b96ca4eacc
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
com.ibm.wala.core/src/com/ibm/wala/logic/Disjunction.java
View File

@ -110,17 +110,26 @@ public class Disjunction extends AbstractBinaryFormula implements IMaxTerm {
public IFormula getF2() {
Collection<? extends IFormula> c = HashSetFactory.make(clauses);
c.remove(getF1());
return make(c);
if (c.size() == 1) {
return c.iterator().next();
} else {
return make(c);
}
}
public static Disjunction make(Collection<? extends IFormula> clauses) {
assert clauses.size() >= 2;
Collection<IFormula> newClauses = HashSetFactory.make();
for (IFormula c : clauses) {
assert !(c instanceof Disjunction);
if (Simplifier.isTautology(c)) {
return make(BooleanConstantFormula.TRUE);
} else if (!Simplifier.isContradiction(c)) {
newClauses.add(c);
if (c instanceof Disjunction) {
Disjunction d = (Disjunction) c;
newClauses.addAll(d.clauses);
} else {
if (Simplifier.isTautology(c)) {
return make(BooleanConstantFormula.TRUE);
} else if (!Simplifier.isContradiction(c)) {
newClauses.add(c);
}
}
}
if (newClauses.isEmpty()) {