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/.

3 files changed, 0 insertions, 67 deletions

diff --git a/src/base/Makefile.am b/src/base/Makefile.am
index b03b61aee..ed41db8ed 100644
--- a/src/base/Makefile.am
+++ b/src/base/Makefile.am
@@ -19,8 +19,6 @@ libbase_la_SOURCES = \
 	cvc4_assert.h \
 	exception.cpp \
 	exception.h \
-	lemma_input_channel_forward.h \
-	lemma_output_channel_forward.h \
 	modal_exception.h \
 	output.cpp \
 	output.h
diff --git a/src/base/lemma_input_channel_forward.h b/src/base/lemma_input_channel_forward.h
deleted file mode 100644
index f74e24b4a..000000000
--- a/src/base/lemma_input_channel_forward.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*********************                                                        */
-/*! \file lemma_input_channel_forward.h
- ** \verbatim
- ** Original author: Tim King
- ** Major contributors: none
- ** Minor contributors (to current version): none
- ** This file is part of the CVC4 project.
- ** Copyright (c) 2009-2014  New York University and The University of Iowa
- ** See the file COPYING in the top-level source directory for licensing
- ** information.\endverbatim
- **
- ** \brief Forward declaration of LemmaInputChannel.
- **
- ** This forward declaration of LemmaInputChannel is needed for the option
- ** lemmaInputChannel (defined in smt_options) can be a LemmaInputChannel*
- ** without including expr.h.
- **/
-
-#include "cvc4_public.h"
-
-#ifndef __CVC4__LEMMA_INPUT_CHANNEL_FORWARD_H
-#define __CVC4__LEMMA_INPUT_CHANNEL_FORWARD_H
-
-namespace CVC4 {
-
-class CVC4_PUBLIC LemmaInputChannel;
-
-}/* CVC4 namespace */
-
-#endif /* __CVC4__LEMMA_INPUT_CHANNEL_FORWARD_H */
diff --git a/src/base/lemma_output_channel_forward.h b/src/base/lemma_output_channel_forward.h
deleted file mode 100644
index c53bcc36f..000000000
--- a/src/base/lemma_output_channel_forward.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*********************                                                        */
-/*! \file lemma_output_channel_forward.h
- ** \verbatim
- ** Original author: Tim King
- ** Major contributors: none
- ** Minor contributors (to current version): none
- ** This file is part of the CVC4 project.
- ** Copyright (c) 2009-2014  New York University and The University of Iowa
- ** See the file COPYING in the top-level source directory for licensing
- ** information.\endverbatim
- **
- ** \brief Forward declaration of the LemmaOutputChannel
- **
- ** This forward declaration of LemmaOutputChannel is needed for the option
- ** lemmaOutputChannel (defined in smt_options) can be a LemmaInputChannel*
- ** without including expr.h.
- **/
-
-#include "cvc4_public.h"
-
-#ifndef __CVC4__LEMMA_OUTPUT_CHANNEL_FORWARD_H
-#define __CVC4__LEMMA_OUTPUT_CHANNEL_FORWARD_H
-
-namespace CVC4 {
-
-/**
- * This interface describes a mechanism for the propositional and theory
- * engines to communicate with the "outside world" about new lemmas being
- * discovered.
- */
-class CVC4_PUBLIC LemmaOutputChannel;
-
-}/* CVC4 namespace */
-
-#endif /* __CVC4__LEMMA_OUTPUT_CHANNEL_FORWARD_H */