Addressed many of the concerns of bug 10 (build system code review).

Some parts split into other bugs: 19, 20, 21.

Addressed concerns of bug 11 (util package code review).

Slight parser source file modifications: file comments, #included
headers in generated parsers/lexers

Added CVC4::Result propagation back through
MiniSat->PropEngine->SmtEngine->main().  Silenced MiniSat when
verbosity is not requested.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/smt/smt_engine.h b/src/smt/smt_engine.h
index 59eddccf0..48365e129 100644
--- a/src/smt/smt_engine.h
+++ b/src/smt/smt_engine.h
@@ -26,7 +26,6 @@
 #include "expr/expr_manager.h"
 #include "util/result.h"
 #include "util/model.h"
-#include "util/options.h"
 #include "prop/prop_engine.h"
 #include "util/decision_engine.h"
 
@@ -37,6 +36,7 @@
 namespace CVC4 {
 
 class Command;
+class Options;
 
 // TODO: SAT layer (esp. CNF- versus non-clausal solvers under the
 // hood): use a type parameter and have check() delegate, or subclass
@@ -56,7 +56,7 @@ public:
   /**
    * Construct an SmtEngine with the given expression manager and user options.
    */
-  SmtEngine(ExprManager* em, Options* opts) throw();
+  SmtEngine(ExprManager* em, const Options* opts) throw();
 
   /**
    * Destruct the SMT engine.
@@ -116,13 +116,13 @@ private:
   std::vector<Node> d_assertions;
 
   /** Our expression manager */
-  ExprManager *d_publicEm;
+  ExprManager* d_publicEm;
 
   /** Out internal expression/node manager */
-  NodeManager *d_nm;
+  NodeManager* d_nm;
 
   /** User-level options */
-  Options *d_opts;
+  const Options* d_opts;
 
   /** The decision engine */
   DecisionEngine d_de;