diff options
author | Dejan Jovanović <dejan.jovanovic@gmail.com> | 2012-02-24 20:29:12 +0000 |
---|---|---|
committer | Dejan Jovanović <dejan.jovanovic@gmail.com> | 2012-02-24 20:29:12 +0000 |
commit | d8da6a3644d1cdbe62d44a8eb80068da4d1d2855 (patch) | |
tree | 773ccef817d1e5cbad85b4c0a1fb44666b1e0600 /src/theory/arrays | |
parent | 5a20a19a30929ad58a9e64a9d8d1f877f3a07ae6 (diff) |
Theory interface changes:
solve -> ppAsert
staticLearning -> ppStaticLearn
preprocess -> ppRewrite
SolveStatus -> PPAssertStatus (SOLVE_* -> PP_ASSERT_*)
via Eclipse refactoring magic.
Diffstat (limited to 'src/theory/arrays')
-rw-r--r-- | src/theory/arrays/theory_arrays.cpp | 10 | ||||
-rw-r--r-- | src/theory/arrays/theory_arrays.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/theory/arrays/theory_arrays.cpp b/src/theory/arrays/theory_arrays.cpp index 601805343..9ef81cc96 100644 --- a/src/theory/arrays/theory_arrays.cpp +++ b/src/theory/arrays/theory_arrays.cpp @@ -187,18 +187,18 @@ Node TheoryArrays::getValue(TNode n) { } } -Theory::SolveStatus TheoryArrays::solve(TNode in, SubstitutionMap& outSubstitutions) { +Theory::PPAssertStatus TheoryArrays::ppAsert(TNode in, SubstitutionMap& outSubstitutions) { switch(in.getKind()) { case kind::EQUAL: { d_staticFactManager.addEq(in); if (in[0].getMetaKind() == kind::metakind::VARIABLE && !in[1].hasSubterm(in[0])) { outSubstitutions.addSubstitution(in[0], in[1]); - return SOLVE_STATUS_SOLVED; + return PP_ASSERT_STATUS_SOLVED; } if (in[1].getMetaKind() == kind::metakind::VARIABLE && !in[0].hasSubterm(in[1])) { outSubstitutions.addSubstitution(in[1], in[0]); - return SOLVE_STATUS_SOLVED; + return PP_ASSERT_STATUS_SOLVED; } break; } @@ -214,7 +214,7 @@ Theory::SolveStatus TheoryArrays::solve(TNode in, SubstitutionMap& outSubstituti default: break; } - return SOLVE_STATUS_UNSOLVED; + return PP_ASSERT_STATUS_UNSOLVED; } Node TheoryArrays::preprocessTerm(TNode term) { @@ -382,7 +382,7 @@ Node TheoryArrays::recursivePreprocessTerm(TNode term) { return newTerm; } -Node TheoryArrays::preprocess(TNode atom) { +Node TheoryArrays::ppRewrite(TNode atom) { if (d_donePreregister) return atom; Assert(atom.getKind() == kind::EQUAL, "expected EQUAL, got %s", atom.toString().c_str()); return recursivePreprocessTerm(atom); diff --git a/src/theory/arrays/theory_arrays.h b/src/theory/arrays/theory_arrays.h index 366c2d3f7..3e12c3499 100644 --- a/src/theory/arrays/theory_arrays.h +++ b/src/theory/arrays/theory_arrays.h @@ -479,8 +479,8 @@ public: Node explain(TNode n); Node getValue(TNode n); - SolveStatus solve(TNode in, SubstitutionMap& outSubstitutions); - Node preprocess(TNode atom); + PPAssertStatus ppAsert(TNode in, SubstitutionMap& outSubstitutions); + Node ppRewrite(TNode atom); void shutdown() { } std::string identify() const { return std::string("TheoryArrays"); } |