From 3378e253fcdb34c753407bb16d08929da06b3aaa Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Mon, 11 Jun 2012 16:28:23 +0000 Subject: Merge from quantifiers2-trunkmerge branch. Adds TheoryQuantifiers and TheoryRewriteRules, QuantifiersEngine, and other infrastructure. Adds theory instantiators to many theories. Adds the UF strong solver. --- test/unit/theory/theory_black.h | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'test/unit/theory/theory_black.h') diff --git a/test/unit/theory/theory_black.h b/test/unit/theory/theory_black.h index 34536445f..74f5870a3 100644 --- a/test/unit/theory/theory_black.h +++ b/test/unit/theory/theory_black.h @@ -74,6 +74,16 @@ public: return LemmaStatus(Node::null(), 0); } + void requirePhase(TNode, bool) + throw(Interrupted, AssertionException) { + Unreachable(); + } + + bool flipDecision() + throw(Interrupted, AssertionException) { + Unreachable(); + } + void setIncomplete() throw(AssertionException) { Unreachable(); @@ -102,8 +112,8 @@ public: set d_registered; vector 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, QuantifiersEngine* qe) : + Theory(theory::THEORY_BUILTIN, ctxt, uctxt, out, valuation, logicInfo, qe) { } void registerTerm(TNode n) { @@ -167,8 +177,8 @@ public: d_nm = new NodeManager(d_ctxt, NULL); d_scope = new NodeManagerScope(d_nm); d_logicInfo = new LogicInfo(); - - d_dummy = new DummyTheory(d_ctxt, d_uctxt, d_outputChannel, Valuation(NULL), *d_logicInfo); + d_logicInfo->lock(); + d_dummy = new DummyTheory(d_ctxt, d_uctxt, d_outputChannel, Valuation(NULL), *d_logicInfo, NULL); d_outputChannel.clear(); atom0 = d_nm->mkConst(true); atom1 = d_nm->mkConst(false); -- cgit v1.2.3