diff options
| author | Tim King <taking@google.com> | 2016-01-05 16:29:44 -0800 |
|---|---|---|
| committer | Tim King <taking@google.com> | 2016-01-05 16:29:44 -0800 |
| commit | 5eabda0f55cee3be81aa7ae126269c32e818322f (patch) | |
| tree | b873e4cb8e5d37ff3bb70596494bc5964aaef135 /src/smt_util | |
| parent | b717513e2a1d956c4456d13e0625957fc84c2449 (diff) | |
Add SmtGlobals Class
- The options replayStream, lemmaInputChannel, lemmaOutputChannel have been removed due to their datatypes. These datatypes were previously pointers to types that were not usable from the options/ library.
- The option replayLog has been removed due to inconsistent memory management.
- SmtGlobals is a class that wraps a pointer to each of these removed options. These can each be set independently.
- There is a single SmtGlobals per SmtEngine with the lifetime of the SmtEngine.
- A pointer to this is freely given to the user of an SmtEngine to parameterize the solver after construction.
- Selected classes have been given a copy of this pointer in their constructors.
- Removed the dependence on Node from Result. Moving Result back into util/.
Diffstat (limited to 'src/smt_util')
| -rw-r--r-- | src/smt_util/command.h | 2 | ||||
| -rw-r--r-- | src/smt_util/lemma_input_channel.h | 1 | ||||
| -rw-r--r-- | src/smt_util/lemma_output_channel.h | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/smt_util/command.h b/src/smt_util/command.h index 17d65beb2..c9b968722 100644 --- a/src/smt_util/command.h +++ b/src/smt_util/command.h @@ -30,12 +30,12 @@ #include "expr/datatype.h" #include "expr/expr.h" -#include "expr/result.h" #include "expr/sexpr.h" #include "expr/type.h" #include "expr/variable_type_map.h" #include "proof/unsat_core.h" #include "util/proof.h" +#include "util/result.h" namespace CVC4 { diff --git a/src/smt_util/lemma_input_channel.h b/src/smt_util/lemma_input_channel.h index 66fe06424..44f0b87f5 100644 --- a/src/smt_util/lemma_input_channel.h +++ b/src/smt_util/lemma_input_channel.h @@ -20,7 +20,6 @@ #ifndef __CVC4__LEMMA_INPUT_CHANNEL_H #define __CVC4__LEMMA_INPUT_CHANNEL_H -#include "base/lemma_input_channel_forward.h" #include "expr/expr.h" namespace CVC4 { diff --git a/src/smt_util/lemma_output_channel.h b/src/smt_util/lemma_output_channel.h index 0fabe5721..df7abd1e9 100644 --- a/src/smt_util/lemma_output_channel.h +++ b/src/smt_util/lemma_output_channel.h @@ -21,7 +21,6 @@ #ifndef __CVC4__LEMMA_OUTPUT_CHANNEL_H #define __CVC4__LEMMA_OUTPUT_CHANNEL_H -#include "base/lemma_output_channel_forward.h" #include "expr/expr.h" namespace CVC4 { |