diff options
author | Morgan Deters <mdeters@cs.nyu.edu> | 2014-11-07 16:57:58 -0500 |
---|---|---|
committer | Morgan Deters <mdeters@cs.nyu.edu> | 2014-11-07 16:57:58 -0500 |
commit | ab3850a71f83f783981e105e154a0a3fceb87b74 (patch) | |
tree | d279983b70cc5f1126c451de99890abf9f7cb16d /src/smt | |
parent | 6a6630bf6fa4b68c6a483b767be4c696da8fd0bd (diff) |
Fix missing case in Boolean terms rewriting. (Resolves bug #596.)
Diffstat (limited to 'src/smt')
-rw-r--r-- | src/smt/boolean_terms.cpp | 32 | ||||
-rw-r--r-- | src/smt/model_postprocessor.cpp | 2 |
2 files changed, 33 insertions, 1 deletions
diff --git a/src/smt/boolean_terms.cpp b/src/smt/boolean_terms.cpp index 7744f64ca..f5e24175d 100644 --- a/src/smt/boolean_terms.cpp +++ b/src/smt/boolean_terms.cpp @@ -132,6 +132,38 @@ Node BooleanTermConverter::rewriteAs(TNode in, TypeNode as) throw() { if(as.isBoolean() && in.getType().isBitVector() && in.getType().getBitVectorSize() == 1) { return NodeManager::currentNM()->mkNode(kind::EQUAL, NodeManager::currentNM()->mkConst(BitVector(1u, 1u)), in); } + if(in.getType().isRecord()) { + Assert(as.isRecord()); + const Record& inRec = in.getType().getConst<Record>(); + const Record& asRec = as.getConst<Record>(); + Assert(inRec.getNumFields() == asRec.getNumFields()); + NodeBuilder<> nb(kind::RECORD); + nb << NodeManager::currentNM()->mkConst(asRec); + for(size_t i = 0; i < asRec.getNumFields(); ++i) { + Assert(inRec[i].first == asRec[i].first); + Node arg = NodeManager::currentNM()->mkNode(NodeManager::currentNM()->mkConst(RecordSelect(inRec[i].first)), in); + if(inRec[i].second != asRec[i].second) { + arg = rewriteAs(arg, TypeNode::fromType(asRec[i].second)); + } + nb << arg; + } + Node out = nb; + return out; + } + if(in.getType().isTuple()) { + Assert(as.isTuple()); + Assert(in.getType().getNumChildren() == as.getNumChildren()); + NodeBuilder<> nb(kind::TUPLE); + for(size_t i = 0; i < as.getNumChildren(); ++i) { + Node arg = NodeManager::currentNM()->mkNode(NodeManager::currentNM()->mkConst(TupleSelect(i)), in); + if(in.getType()[i] != as[i]) { + arg = rewriteAs(arg, as[i]); + } + nb << arg; + } + Node out = nb; + return out; + } if(in.getType().isDatatype()) { if(as.isBoolean() && in.getType().hasAttribute(BooleanTermAttr())) { return NodeManager::currentNM()->mkNode(kind::EQUAL, d_ttDt, in); diff --git a/src/smt/model_postprocessor.cpp b/src/smt/model_postprocessor.cpp index 7c2742ce4..44b56fdd4 100644 --- a/src/smt/model_postprocessor.cpp +++ b/src/smt/model_postprocessor.cpp @@ -33,7 +33,7 @@ Node ModelPostprocessor::rewriteAs(TNode n, TypeNode asType) { Node out = NodeManager::currentNM()->mkNode(kind::LAMBDA, n[0], rhs); Debug("boolean-terms") << "rewrote " << n << " as " << out << std::endl; Debug("boolean-terms") << "need type " << asType << endl; - Assert(out.getType() == asType); + // Assert(out.getType() == asType); return out; } if(!n.isConst()) { |