Functions and predicates over Boolean now work with --check-models and output correct

models for such functions (though they are somewhat ugly at present).

There's still a problem with model extraction, but it's not Boolean terms' fault.
Sometimes checkModel() can report that the model is just fine, but if a user extracts
values with getValue(), they find problems with the model (i.e., it doesn't satisfy some
assertions).  This appears to be due to an asymmetry between how checkModel() works and
how Model::getValue() works.  I'll open a bugzilla report to discuss this after thinking
some more on it.

(this commit was certified error- and warning-free by the test-and-commit script.)

1 files changed, 7 insertions, 0 deletions

diff --git a/src/smt/boolean_terms.h b/src/smt/boolean_terms.h
index dea9adcf7..e51a7bbb0 100644
--- a/src/smt/boolean_terms.h
+++ b/src/smt/boolean_terms.h
@@ -41,6 +41,9 @@ class BooleanTermConverter {
                          PairHashFunction< Node, bool,
                                            NodeHashFunction, std::hash<int> > > BooleanTermCache;
 
+  /** The SmtEngine to which we're associated */
+  SmtEngine& d_smt;
+
   /** The cache used during Boolean term conversion */
   BooleanTermCache d_booleanTermCache;
 
@@ -51,6 +54,10 @@ class BooleanTermConverter {
 
 public:
 
+  BooleanTermConverter(SmtEngine& smt) :
+    d_smt(smt) {
+  }
+
   /**
    * We rewrite Boolean terms in assertions as bitvectors of length 1.
    */