diff options
| author | Dejan Jovanović <dejan.jovanovic@gmail.com> | 2010-09-20 01:08:32 +0000 |
|---|---|---|
| committer | Dejan Jovanović <dejan.jovanovic@gmail.com> | 2010-09-20 01:08:32 +0000 |
| commit | 1b30b256a0ec40ff431b83296bfe5aa0e099eb2e (patch) | |
| tree | 91fb063e9cfcf360d601e21a19996995576ece7d /src/expr | |
| parent | 9eaf94708275337a4749b7ef2f44bf1c6746d8fc (diff) | |
bitvector rewriting for the core theory and testcases
Diffstat (limited to 'src/expr')
| -rw-r--r-- | src/expr/node_builder.h | 8 | ||||
| -rw-r--r-- | src/expr/node_manager.cpp | 2 | ||||
| -rw-r--r-- | src/expr/node_manager.h | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/expr/node_builder.h b/src/expr/node_builder.h index 4a6dd794e..422cb47a8 100644 --- a/src/expr/node_builder.h +++ b/src/expr/node_builder.h @@ -902,13 +902,13 @@ expr::NodeValue* NodeBuilder<nchild_thresh>::constructNV() { // check that there are the right # of children for this kind Assert(getMetaKind() != kind::metakind::CONSTANT, "Cannot make Nodes with NodeBuilder that have CONSTANT-kinded kinds"); - Assert(d_nv->d_nchildren >= kind::metakind::getLowerBoundForKind(getKind()), + Assert(getNumChildren() >= kind::metakind::getLowerBoundForKind(getKind()), "Nodes with kind %s must have at least %u children (the one under " "construction has %u)", kind::kindToString(getKind()).c_str(), kind::metakind::getLowerBoundForKind(getKind()), getNumChildren()); - Assert(d_nv->d_nchildren <= kind::metakind::getUpperBoundForKind(getKind()), + Assert(getNumChildren() <= kind::metakind::getUpperBoundForKind(getKind()), "Nodes with kind %s must have at most %u children (the one under " "construction has %u)", kind::kindToString(getKind()).c_str(), @@ -1073,13 +1073,13 @@ expr::NodeValue* NodeBuilder<nchild_thresh>::constructNV() const { // check that there are the right # of children for this kind Assert(getMetaKind() != kind::metakind::CONSTANT, "Cannot make Nodes with NodeBuilder that have CONSTANT-kinded kinds"); - Assert(d_nv->d_nchildren >= kind::metakind::getLowerBoundForKind(getKind()), + Assert(getNumChildren() >= kind::metakind::getLowerBoundForKind(getKind()), "Nodes with kind %s must have at least %u children (the one under " "construction has %u)", kind::kindToString(getKind()).c_str(), kind::metakind::getLowerBoundForKind(getKind()), getNumChildren()); - Assert(d_nv->d_nchildren <= kind::metakind::getUpperBoundForKind(getKind()), + Assert(getNumChildren() <= kind::metakind::getUpperBoundForKind(getKind()), "Nodes with kind %s must have at most %u children (the one under " "construction has %u)", kind::kindToString(getKind()).c_str(), diff --git a/src/expr/node_manager.cpp b/src/expr/node_manager.cpp index 37ed4fe20..b7bbe2ff8 100644 --- a/src/expr/node_manager.cpp +++ b/src/expr/node_manager.cpp @@ -277,7 +277,7 @@ TypeNode NodeManager::getType(TNode n, bool check) case kind::STORE: typeNode = CVC4::theory::arrays::ArrayStoreTypeRule::computeType(this, n, check); break; - case kind::BITVECTOR_CONST: + case kind::CONST_BITVECTOR: typeNode = CVC4::theory::bv::BitVectorConstantTypeRule::computeType(this, n, check); break; case kind::BITVECTOR_AND: diff --git a/src/expr/node_manager.h b/src/expr/node_manager.h index baa8de5aa..5c6a05a03 100644 --- a/src/expr/node_manager.h +++ b/src/expr/node_manager.h @@ -916,7 +916,6 @@ template <bool ref_count> inline Node NodeManager::mkNode(TNode opNode, const std::vector<NodeTemplate<ref_count> >& children) { - Assert(kind::metaKindOf(opNode.getKind()) == kind::metakind::PARAMETERIZED); NodeBuilder<> nb(this, kind::operatorKindToKind(opNode.getKind())); nb << opNode; nb.append(children); |