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.h | |
| 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.h')
| -rw-r--r-- | src/theory/quantifiers_engine.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/theory/quantifiers_engine.h b/src/theory/quantifiers_engine.h index 91c21a650..c7c716105 100644 --- a/src/theory/quantifiers_engine.h +++ b/src/theory/quantifiers_engine.h @@ -24,8 +24,6 @@ #include "context/cdhashset.h" #include "context/cdlist.h" #include "theory/quantifiers/quant_util.h" -#include "theory/quantifiers/quantifiers_registry.h" -#include "theory/quantifiers/term_registry.h" #include "util/statistics_registry.h" namespace CVC4 { @@ -49,10 +47,12 @@ class QModelBuilder; class QuantifiersInferenceManager; class QuantifiersModules; class QuantifiersState; +class QuantifiersRegistry; class Skolemize; class TermDb; class TermDbSygus; class TermEnumeration; +class TermRegistry; } // TODO: organize this more/review this, github issue #1163 @@ -65,6 +65,8 @@ class QuantifiersEngine { public: QuantifiersEngine(quantifiers::QuantifiersState& qstate, + quantifiers::QuantifiersRegistry& qr, + quantifiers::TermRegistry& tr, quantifiers::QuantifiersInferenceManager& qim, ProofNodeManager* pnm); ~QuantifiersEngine(); @@ -270,9 +272,9 @@ public: std::vector<QuantifiersModule*> d_modules; //------------- quantifiers utilities /** The quantifiers registry */ - quantifiers::QuantifiersRegistry d_qreg; + quantifiers::QuantifiersRegistry& d_qreg; /** The term registry */ - quantifiers::TermRegistry d_treg; + quantifiers::TermRegistry& d_treg; /** all triggers will be stored in this trie */ std::unique_ptr<inst::TriggerTrie> d_tr_trie; /** extended model object */ |