Bug-related:

* ITE removal fixed to be context-dependent (on UserContext).
  Resolves incrementality bugs 376 and 396 (which had given wrong answers).
* some bugfixes for incrementality that Dejan found (fixes bug 394)
* fix for bug in SmtEngine::getValue() where definitions weren't respected
  (partially resolves bug 411, but get-model is still broken).
* change status of microwave21.ec.minimized.smt2 (it's actually unsat, but
  was labeled sat); re-enable it for "make regress"

Also:

* --check-model doesn't fail if quantified assertions don't simplify away.

* fix some examples, and the Java system test, for the disappearance of the
  BoolExpr class

* add copy constructor to array type enumerator (the type enumerator
  framework requires copy ctors, and the automatically-generated copy ctor
  was copying pointers that were then deleted, leaving dangling pointers in
  the copy and causing segfaults)

* --dump=assertions now implies --dump=skolems
* --dump=assertions:pre-<PASS> and --dump=assertions:post-<PASS> now allow
  you to dump before/after a particular preprocessing pass.  E.g.,
  --dump=assertions:pre-ite-removal or --dump=assertions:post-static-learning.
  "--dump=assertions" by itself is after all preprocessing, just before CNF
  conversion.
* minor fixes to dumping output
* include Model in language bindings

Minor refactoring/misc:

* fix compiler warning in src/theory/model.cpp
* remove unnecessary SmtEngine::printModel().
* mkoptions script doesn't give progress output if stdout isn't a terminal
  (e.g., if it's written to a log, or piped through less(1), or whatever).
* add some type enumerator unit tests
* de-emphasize --parse-only and --preprocess-only (they aren't really "common"
  options)
* fix some exception throw() specifications in SmtEngine
* minor documentation clarifications

1 files changed, 10 insertions, 5 deletions

diff --git a/src/util/util_model.h b/src/util/util_model.h
index 97010dd45..07f964d46 100644
--- a/src/util/util_model.h
+++ b/src/util/util_model.h
@@ -29,14 +29,21 @@ namespace CVC4 {
 
 class CVC4_PUBLIC Command;
 class CVC4_PUBLIC SmtEngine;
+class CVC4_PUBLIC Model;
+
+std::ostream& operator<<(std::ostream&, Model&) CVC4_PUBLIC;
 
 class CVC4_PUBLIC Model {
-private:
+  friend std::ostream& operator<<(std::ostream&, Model&);
+
+protected:
   /** The SmtEngine we're associated to */
   const SmtEngine& d_smt;
-public:
-  /** construct the base class */
+
+  /** construct the base class; users cannot do this, only CVC4 internals */
   Model();
+
+public:
   /** virtual destructor */
   virtual ~Model() { }
   /** get number of commands to report */
@@ -48,8 +55,6 @@ public:
   virtual Expr getValue(Expr expr) = 0;
   /** get cardinality for sort */
   virtual Cardinality getCardinality(Type t) = 0;
-  /** write the model to a stream */
-  virtual void toStream(std::ostream& out) = 0;
 };/* class Model */
 
 class ModelBuilder