diff options
| author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2021-03-15 13:17:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-15 18:17:19 +0000 |
| commit | 6d060743830ab21dc970444688fe1dc2ad34494f (patch) | |
| tree | ee51b9642df2f12cec969a665472074c17e8457e /src/theory/quantifiers_engine.cpp | |
| parent | 7d09d8bffc4c055900ddf933db37355ec6258b06 (diff) | |
Reorganizing initialization of term registry in quantifiers (#6127)
This is in preparation for moving several utilities into the quantifiers inference manager.
This PR moves ownership of TermRegistry and QuantifiersRegistry to TheoryQuantifiers from QuantifiersEngine.
Diffstat (limited to 'src/theory/quantifiers_engine.cpp')
| -rw-r--r-- | src/theory/quantifiers_engine.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/theory/quantifiers_engine.cpp b/src/theory/quantifiers_engine.cpp index 24919fae0..c41fa36e6 100644 --- a/src/theory/quantifiers_engine.cpp +++ b/src/theory/quantifiers_engine.cpp @@ -26,17 +26,17 @@ #include "theory/quantifiers/fmf/first_order_model_fmc.h" #include "theory/quantifiers/fmf/full_model_check.h" #include "theory/quantifiers/fmf/model_builder.h" +#include "theory/quantifiers/quant_module.h" #include "theory/quantifiers/quantifiers_inference_manager.h" #include "theory/quantifiers/quantifiers_modules.h" +#include "theory/quantifiers/quantifiers_registry.h" #include "theory/quantifiers/quantifiers_rewriter.h" #include "theory/quantifiers/quantifiers_state.h" -#include "theory/quantifiers/quant_module.h" #include "theory/quantifiers/relevant_domain.h" #include "theory/quantifiers/skolemize.h" -#include "theory/quantifiers/sygus/term_database_sygus.h" -#include "theory/quantifiers/term_util.h" -#include "theory/quantifiers/term_database.h" #include "theory/quantifiers/term_enumeration.h" +#include "theory/quantifiers/term_registry.h" +#include "theory/quantifiers/term_util.h" #include "theory/theory_engine.h" #include "theory/uf/equality_engine.h" @@ -48,6 +48,8 @@ namespace theory { QuantifiersEngine::QuantifiersEngine( quantifiers::QuantifiersState& qstate, + quantifiers::QuantifiersRegistry& qr, + quantifiers::TermRegistry& tr, quantifiers::QuantifiersInferenceManager& qim, ProofNodeManager* pnm) : d_qstate(qstate), @@ -55,8 +57,8 @@ QuantifiersEngine::QuantifiersEngine( d_te(nullptr), d_decManager(nullptr), d_pnm(pnm), - d_qreg(), - d_treg(qstate, qim, d_qreg), + d_qreg(qr), + d_treg(tr), d_tr_trie(new inst::TriggerTrie), d_model(nullptr), d_builder(nullptr), |