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

tweak NotFormula stuff to work better with CNF 

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@2704 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
sjfink 2008-03-13 19:41:27 +00:00
parent e1adf2113b
commit e48b76ad21
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
com.ibm.wala.core/src/com/ibm/wala/logic/CNFFormula.java
View File

@ -143,7 +143,7 @@ public class CNFFormula extends AbstractBinaryFormula implements ICNFFormula {
case NEGATION:
NotFormula n = (NotFormula) f;
if (n.getFormula() instanceof RelationFormula) {
IMaxTerm t = NotFormulaMaxTerm.make((RelationFormula)n.getFormula());
IMaxTerm t = NotFormulaMaxTerm.createNotFormulaMaxTerm((RelationFormula)n.getFormula());
return Collections.singleton(t);
} else {
// should not get here if other logic is working.

2
com.ibm.wala.core/src/com/ibm/wala/logic/NotFormula.java
View File

@ -54,7 +54,7 @@ public class NotFormula implements IFormula {
if (r.getRelation().equals(BinaryRelation.LT)) {
return RelationFormula.make(BinaryRelation.GE, r.getTerms());
}
return new NotFormula(f);
return NotFormulaMaxTerm.createNotFormulaMaxTerm(r);
case CONSTANT:
if (f.equals(BooleanConstantFormula.TRUE)) {
return BooleanConstantFormula.FALSE;

2
com.ibm.wala.core/src/com/ibm/wala/logic/NotFormulaMaxTerm.java
View File

@ -23,7 +23,7 @@ import java.util.Collections;
*/
public class NotFormulaMaxTerm extends NotFormula implements IMaxTerm {
public static NotFormulaMaxTerm make(RelationFormula f) {
public static NotFormulaMaxTerm createNotFormulaMaxTerm(RelationFormula f) {
return new NotFormulaMaxTerm(f);
}

2
com.ibm.wala.core/src/com/ibm/wala/logic/Simplifier.java
View File

@ -418,7 +418,7 @@ public class Simplifier {
NotFormulaMaxTerm n = (NotFormulaMaxTerm) formula;
RelationFormula F = (RelationFormula) n.getFormula();
RelationFormula subF = (RelationFormula)substitute(F, t1, t2);
return (F != subF ? NotFormulaMaxTerm.make(subF) : formula);
return (F != subF ? NotFormulaMaxTerm.createNotFormulaMaxTerm(subF) : formula);
case QUANTIFIED:
Assertions.UNREACHABLE();
return null;