diff options
| author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2021-01-11 11:23:15 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-11 11:23:15 -0600 |
| commit | 8c04f1639607b34b56e3eaa8d3188b27e1454b41 (patch) | |
| tree | b4427f298b2fde0686b7fdd98008f2fdc0173321 /test/unit/prop | |
| parent | b8841e768a37131c492508cd0e12b9acd8bf4c2b (diff) | |
Merge theory registrar and theory proxy (#5758)
The motivation of this PR is to make TheoryProxy the single point of contact to TheoryEngine from PropEngine.
This merges the helper class TheoryRegistrar into TheoryProxy.
Diffstat (limited to 'test/unit/prop')
| -rw-r--r-- | test/unit/prop/cnf_stream_white.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/unit/prop/cnf_stream_white.h b/test/unit/prop/cnf_stream_white.h index 495097a79..5200d81d8 100644 --- a/test/unit/prop/cnf_stream_white.h +++ b/test/unit/prop/cnf_stream_white.h @@ -24,6 +24,7 @@ #include "expr/node_manager.h" #include "prop/cnf_stream.h" #include "prop/prop_engine.h" +#include "prop/registrar.h" #include "prop/theory_proxy.h" #include "smt/smt_engine.h" #include "smt/smt_engine_scope.h" @@ -32,7 +33,6 @@ #include "theory/builtin/theory_builtin.h" #include "theory/theory.h" #include "theory/theory_engine.h" -#include "theory/theory_registrar.h" using namespace CVC4; using namespace CVC4::context; @@ -119,7 +119,7 @@ class CnfStreamWhite : public CxxTest::TestSuite { Context* d_cnfContext; /** The registrar used by the CnfStream. */ - theory::TheoryRegistrar* d_cnfRegistrar; + prop::NullRegistrar* d_cnfRegistrar; /** The node manager */ NodeManager* d_nodeManager; @@ -144,7 +144,7 @@ class CnfStreamWhite : public CxxTest::TestSuite { d_satSolver = new FakeSatSolver(); d_cnfContext = new context::Context(); - d_cnfRegistrar = new theory::TheoryRegistrar(d_theoryEngine); + d_cnfRegistrar = new prop::NullRegistrar; ResourceManager* rm = d_smt->getResourceManager(); d_cnfStream = new CVC4::prop::CnfStream(d_satSolver, d_cnfRegistrar, |