diff options
author | Morgan Deters <mdeters@gmail.com> | 2012-08-03 20:39:25 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2012-08-03 20:39:25 +0000 |
commit | 3daaecd22fe5f6147cb08e5a4e08177b33a2daa2 (patch) | |
tree | 46cb65c3673a5678a7779ff970aea9460233f1f1 /src/util | |
parent | e26a44d5f98a9953dffeb07b29a21e7efd501684 (diff) |
fix uses of getMetaKind() from outside the expr package. (they now use isConst() and isVar() as appropriate)
also some base infrastructure for the new ::isConst().
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/boolean_simplification.cpp | 4 | ||||
-rw-r--r-- | src/util/boolean_simplification.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/util/boolean_simplification.cpp b/src/util/boolean_simplification.cpp index 862f1e5fc..e21aadf05 100644 --- a/src/util/boolean_simplification.cpp +++ b/src/util/boolean_simplification.cpp @@ -37,7 +37,7 @@ BooleanSimplification::push_back_associative_commute_recursive } }else{ if(negateNode){ - if(child.getMetaKind() == kind::metakind::CONSTANT) { + if(child.isConst()) { if((k == kind::AND && child.getConst<bool>()) || (k == kind::OR && !child.getConst<bool>())) { buffer.clear(); @@ -48,7 +48,7 @@ BooleanSimplification::push_back_associative_commute_recursive buffer.push_back(negate(child)); } }else{ - if(child.getMetaKind() == kind::metakind::CONSTANT) { + if(child.isConst()) { if((k == kind::OR && child.getConst<bool>()) || (k == kind::AND && !child.getConst<bool>())) { buffer.clear(); diff --git a/src/util/boolean_simplification.h b/src/util/boolean_simplification.h index b3dffa475..a5a646231 100644 --- a/src/util/boolean_simplification.h +++ b/src/util/boolean_simplification.h @@ -187,7 +187,7 @@ public: base = base[0]; polarity = !polarity; } - if(n.getMetaKind() == kind::metakind::CONSTANT) { + if(n.isConst()) { return NodeManager::currentNM()->mkConst(!n.getConst<bool>()); } if(polarity){ |