diff options
author | Tim King <taking@google.com> | 2016-01-05 16:29:44 -0800 |
---|---|---|
committer | Tim King <taking@google.com> | 2016-01-05 16:29:44 -0800 |
commit | 5eabda0f55cee3be81aa7ae126269c32e818322f (patch) | |
tree | b873e4cb8e5d37ff3bb70596494bc5964aaef135 /test/unit/theory/theory_white.h | |
parent | b717513e2a1d956c4456d13e0625957fc84c2449 (diff) |
Add SmtGlobals Class
- The options replayStream, lemmaInputChannel, lemmaOutputChannel have been removed due to their datatypes. These datatypes were previously pointers to types that were not usable from the options/ library.
- The option replayLog has been removed due to inconsistent memory management.
- SmtGlobals is a class that wraps a pointer to each of these removed options. These can each be set independently.
- There is a single SmtGlobals per SmtEngine with the lifetime of the SmtEngine.
- A pointer to this is freely given to the user of an SmtEngine to parameterize the solver after construction.
- Selected classes have been given a copy of this pointer in their constructors.
- Removed the dependence on Node from Result. Moving Result back into util/.
Diffstat (limited to 'test/unit/theory/theory_white.h')
-rw-r--r-- | test/unit/theory/theory_white.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/test/unit/theory/theory_white.h b/test/unit/theory/theory_white.h index c804ca307..429e72fc6 100644 --- a/test/unit/theory/theory_white.h +++ b/test/unit/theory/theory_white.h @@ -52,7 +52,9 @@ public: ~TestOutputChannel() {} - void safePoint() throw(Interrupted, AssertionException) {} + void safePoint(uint64_t amount) + throw(Interrupted, UnsafeInterruptException, AssertionException) + {} void conflict(TNode n) throw(AssertionException) { @@ -119,9 +121,10 @@ public: set<Node> d_registered; vector<Node> d_getSequence; - DummyTheory(Context* ctxt, UserContext* uctxt, OutputChannel& out, Valuation valuation, const LogicInfo& logicInfo) : - Theory(theory::THEORY_BUILTIN, ctxt, uctxt, out, valuation, logicInfo) { - } + DummyTheory(Context* ctxt, UserContext* uctxt, OutputChannel& out, + Valuation valuation, const LogicInfo& logicInfo, SmtGlobals* globals) + : Theory(theory::THEORY_BUILTIN, ctxt, uctxt, out, valuation, logicInfo, globals) + {} void registerTerm(TNode n) { // check that we registerTerm() a term only once @@ -156,7 +159,7 @@ public: } void preRegisterTerm(TNode n) {} void propagate(Effort level) {} - void explain(TNode n, Effort level) {} + Node explain(TNode n) { return Node::null(); } Node getValue(TNode n) { return Node::null(); } string identify() const { return "DummyTheory"; } };/* class DummyTheory */ @@ -196,7 +199,8 @@ public: d_smt->d_theoryEngine->d_theoryTable[THEORY_BUILTIN] = NULL; d_smt->d_theoryEngine->d_theoryOut[THEORY_BUILTIN] = NULL; - d_dummy = new DummyTheory(d_ctxt, d_uctxt, d_outputChannel, Valuation(NULL), *d_logicInfo); + d_dummy = new DummyTheory(d_ctxt, d_uctxt, d_outputChannel, Valuation(NULL), + *d_logicInfo, d_smt->globals()); d_outputChannel.clear(); atom0 = d_nm->mkConst(true); atom1 = d_nm->mkConst(false); |