diff options
author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2021-03-23 15:41:13 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-23 20:41:13 +0000 |
commit | d5d526730d11d08c65aa17ea53d0dffb0a72e692 (patch) | |
tree | 13ce2001785e168ea82cbd0bce0c1750f987a338 /src/theory/quantifiers_engine.h | |
parent | 8fc8793f4337663f7250846dd6acae167a7f27ec (diff) |
Passing term registry to ematching utilities (#6190)
Model is now nested into term registry.
This PR also resolves some complications due to namespaces within quantifiers.
Diffstat (limited to 'src/theory/quantifiers_engine.h')
-rw-r--r-- | src/theory/quantifiers_engine.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/theory/quantifiers_engine.h b/src/theory/quantifiers_engine.h index b6562caa7..1f1dcc950 100644 --- a/src/theory/quantifiers_engine.h +++ b/src/theory/quantifiers_engine.h @@ -36,10 +36,12 @@ class DecisionManager; class QuantifiersModule; class RepSetIterator; +namespace quantifiers { + namespace inst { class TriggerTrie; } -namespace quantifiers { + class FirstOrderModel; class Instantiate; class QModelBuilder; @@ -67,7 +69,6 @@ class QuantifiersEngine { quantifiers::QuantifiersRegistry& qr, quantifiers::TermRegistry& tr, quantifiers::QuantifiersInferenceManager& qim, - quantifiers::FirstOrderModel* qm, ProofNodeManager* pnm); ~QuantifiersEngine(); //---------------------- external interface @@ -96,7 +97,7 @@ class QuantifiersEngine { /** get skolemize utility */ quantifiers::Skolemize* getSkolemize() const; /** get trigger database */ - inst::TriggerTrie* getTriggerDatabase() const; + quantifiers::inst::TriggerTrie* getTriggerDatabase() const; //---------------------- end utilities private: //---------------------- private initialization @@ -234,7 +235,7 @@ public: /** The term registry */ quantifiers::TermRegistry& d_treg; /** all triggers will be stored in this trie */ - std::unique_ptr<inst::TriggerTrie> d_tr_trie; + std::unique_ptr<quantifiers::inst::TriggerTrie> d_tr_trie; /** extended model object */ quantifiers::FirstOrderModel* d_model; //------------- end quantifiers utilities |