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

added getSentencesRelevantToConstraints() to ITheory 

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@2568 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
msridhar1 2008-02-12 22:36:44 +00:00
parent 245ec9c7d5
commit 4eba933775
5 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
com.ibm.wala.core/src/com/ibm/wala/logic/AbstractTheory.java
View File

@ -10,6 +10,7 @@
*******************************************************************************/
package com.ibm.wala.logic;
import java.util.Collection;
import java.util.TreeSet;
public abstract class AbstractTheory extends DefaultDecorator implements ITheory {
@ -31,4 +32,12 @@ public abstract class AbstractTheory extends DefaultDecorator implements ITheory
return result.toString();
}
/**
* by default, just return all sentences
*/
public Collection<? extends IFormula> getSentencesRelevantToConstraints(Collection<? extends IFormula> constraints) {
return getSentences();
}
}

8
com.ibm.wala.core/src/com/ibm/wala/logic/CombinedTheory.java
View File

@ -49,6 +49,14 @@ public class CombinedTheory extends AbstractTheory {
return union;
}
@Override
public Collection<? extends IFormula> getSentencesRelevantToConstraints(Collection<? extends IFormula> constraints) {
Set<IFormula> union = HashSetFactory.make();
union.addAll(a.getSentencesRelevantToConstraints(constraints));
union.addAll(b.getSentencesRelevantToConstraints(constraints));
return union;
}
public IVocabulary getVocabulary() {
return CombinedVocabulary.make(a.getVocabulary(), b.getVocabulary());
}

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

@ -41,7 +41,7 @@ public interface IFormula {
public Collection<? extends IConstant> getConstants();
/**
* @return all terms that appear in this formula, including recursive descent on on-atomic terms
* @return all terms that appear in this formula, including recursive descent non on-atomic terms
*/
public Collection<? extends ITerm> getAllTerms();

12
com.ibm.wala.core/src/com/ibm/wala/logic/ITheory.java
View File

@ -22,6 +22,18 @@ public interface ITheory {
public IVocabulary getVocabulary();
/**
* get all sentences in theory
* TODO: remove this, replace with getSentencesRelevantToConstraints(empty)? MS
* @return the sentences
*/
public Collection<? extends IFormula> getSentences();
/**
*
* @param constraints
* @return those sentences in this theory relevant to constraints
*/
public Collection<? extends IFormula> getSentencesRelevantToConstraints(Collection<? extends IFormula> constraints);
}

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

@ -35,12 +35,12 @@ public class Simplifier {
* Eliminate quantifiers, by substituting every possible constant value for a
* quantified variable
*/
public static ITheory eliminateQuantifiers(ITheory t) {
public static ITheory eliminateQuantifiers(ITheory t, Collection<? extends IFormula> constraints) {
if (t == null) {
throw new IllegalArgumentException("t is null");
}
Collection<IFormula> sentences = HashSetFactory.make();
for (IFormula s : t.getSentences()) {
for (IFormula s : t.getSentencesRelevantToConstraints(constraints)) {
sentences.addAll(eliminateQuantifiers(s));
}
return BasicTheory.make(t.getVocabulary(), sentences);