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, 20 insertions, 4 deletions

diff --git a/src/smt/boolean_terms.cpp b/src/smt/boolean_terms.cpp
index c332642f1..f90b5ff51 100644
--- a/src/smt/boolean_terms.cpp
+++ b/src/smt/boolean_terms.cpp
@@ -110,11 +110,29 @@ Node BooleanTermConverter::rewriteBooleanTerms(TNode top, bool boolParent) throw
           vector<TypeNode> argTypes = t.getArgTypes();
           replace(argTypes.begin(), argTypes.end(), t[i], nm->mkBitVectorType(1));
           TypeNode newType = nm->mkFunctionType(argTypes, t.getRangeType());
-          Node n = nm->mkSkolem(top.getAttribute(expr::VarNameAttr()) + "_bt",
+          Node n = nm->mkSkolem(top.getAttribute(expr::VarNameAttr()) + "__boolterm__",
                                 newType, "a function introduced by Boolean-term conversion",
                                 NodeManager::SKOLEM_EXACT_NAME);
           Debug("boolean-terms") << "constructed func: " << n << " of type " << newType << endl;
           top.setAttribute(BooleanTermAttr(), n);
+          NodeBuilder<> boundVarsBuilder(kind::BOUND_VAR_LIST);
+          NodeBuilder<> bodyBuilder(kind::APPLY_UF);
+          bodyBuilder << n;
+          for(unsigned j = 0; j < t.getNumChildren() - 1; ++j) {
+            Node var = nm->mkBoundVar(t[j]);
+            boundVarsBuilder << var;
+            if(t[j].isBoolean()) {
+              bodyBuilder << nm->mkNode(kind::ITE, var, nm->mkConst(BitVector(1u, 1u)),
+                                        nm->mkConst(BitVector(1u, 0u)));
+            } else {
+              bodyBuilder << var;
+            }
+          }
+          Node boundVars = boundVarsBuilder;
+          Node body = bodyBuilder;
+          Node lam = nm->mkNode(kind::LAMBDA, boundVars, body);
+          Debug("boolean-terms") << "substituting " << top << " ==> " << lam << std::endl;
+          d_smt.d_theoryEngine->getModel()->addSubstitution(top, lam);
           d_booleanTermCache[make_pair(top, boolParent)] = n;
           return n;
         }
@@ -205,9 +223,7 @@ Node BooleanTermConverter::rewriteBooleanTerms(TNode top, bool boolParent) throw
           return n;
         }
       }
-    }/* else if(t.isRecord()) {
-      Unimplemented();
-    }*/
+    }
     return top;
   }
   switch(k) {