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().

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){