diff options
author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2020-10-16 13:32:42 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-16 13:32:42 -0500 |
commit | 7c249b3efdeeb51fd3dfc2571bc529c55880cf5c (patch) | |
tree | 220a1c3f2aa53b047c2a52260fce3bd2dce22429 /src/smt/command.h | |
parent | 547df7cd146091674562dfa4812f10bae7765934 (diff) |
Refactor SMT-level model object (#5277)
This refactors the SMT-level model object so that it is a wrapper around TheoryModel instead of a base class. This inheritance was unnecessary.
Moreover, it removes the virtual base models of the SMT-level model which were based on Expr. Now the interface is more minimal and in terms of Node only.
This PR further simplifies a few places in the code that interface with the SmtEngine with things related to models.
Diffstat (limited to 'src/smt/command.h')
-rw-r--r-- | src/smt/command.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/smt/command.h b/src/smt/command.h index b823b5730..41776cee5 100644 --- a/src/smt/command.h +++ b/src/smt/command.h @@ -46,7 +46,10 @@ class Term; class SmtEngine; class Command; class CommandStatus; + +namespace smt { class Model; +} std::ostream& operator<<(std::ostream&, const Command&) CVC4_PUBLIC; std::ostream& operator<<(std::ostream&, const Command*) CVC4_PUBLIC; @@ -995,7 +998,7 @@ class CVC4_PUBLIC GetModelCommand : public Command OutputLanguage language = language::output::LANG_AUTO) const override; protected: - Model* d_result; + smt::Model* d_result; }; /* class GetModelCommand */ /** The command to block models. */ |