Merge from nonclausal-simplification-v2 branch:

* Preprocessing-time, non-clausal, Boolean simplification round to
  support "quasi-non-linear rewrites" as discussed at last few meetings.

* --simplification=none is the default for now, but we'll probably
  change that to --simplification=incremental.  --simplification=batch
  is also a possibility.  See --simplification=help for details.

* RecursionBreaker<T> now uses a hash set for the seen trail.
* Fixes to TLS stuff to support that.
* Fixes to theory and SmtEngine documentation.
* Fixes to stream indentation.
* Other miscellaneous stuff.

1 files changed, 9 insertions, 2 deletions

diff --git a/src/smt/smt_engine.h b/src/smt/smt_engine.h
index 408db1a2f..38c064492 100644
--- a/src/smt/smt_engine.h
+++ b/src/smt/smt_engine.h
@@ -148,6 +148,11 @@ class CVC4_PUBLIC SmtEngine {
   Result d_status;
 
   /**
+   * A private utility class to SmtEngine.
+   */
+  smt::SmtEnginePrivate* d_private;
+
+  /**
    * This is called by the destructor, just before destroying the
    * PropEngine, TheoryEngine, and DecisionEngine (in that order).  It
    * is important because there are destruction ordering issues
@@ -260,8 +265,10 @@ public:
   Result checkSat(const BoolExpr& e);
 
   /**
-   * Simplify a formula without doing "much" work.  Requires assist
-   * from the SAT Engine.
+   * Simplify a formula without doing "much" work.  Does not involve
+   * the SAT Engine in the simplification, but uses the current
+   * assertions and the current partial model, if one has been
+   * constructed.
    *
    * @todo (design) is this meant to give an equivalent or an
    * equisatisfiable formula?