diff options
Diffstat (limited to 'src/printer')
-rw-r--r-- | src/printer/cvc/cvc_printer.cpp | 4 | ||||
-rw-r--r-- | src/printer/dagification_visitor.cpp | 8 | ||||
-rw-r--r-- | src/printer/smt2/smt2_printer.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/printer/cvc/cvc_printer.cpp b/src/printer/cvc/cvc_printer.cpp index 664ea58fc..564769207 100644 --- a/src/printer/cvc/cvc_printer.cpp +++ b/src/printer/cvc/cvc_printer.cpp @@ -81,7 +81,7 @@ void CvcPrinter::toStream(std::ostream& out, TNode n, int depth, bool types, boo } // variables - if(n.getMetaKind() == kind::metakind::VARIABLE) { + if(n.isVar()) { string s; if(n.getAttribute(expr::VarNameAttr(), s)) { out << s; @@ -102,7 +102,7 @@ void CvcPrinter::toStream(std::ostream& out, TNode n, int depth, bool types, boo } // constants - if(n.getMetaKind() == kind::metakind::CONSTANT) { + if(n.isConst()) { switch(n.getKind()) { case kind::BITVECTOR_TYPE: out << "BITVECTOR(" << n.getConst<BitVectorSize>().size << ")"; diff --git a/src/printer/dagification_visitor.cpp b/src/printer/dagification_visitor.cpp index 81183182d..580bec63c 100644 --- a/src/printer/dagification_visitor.cpp +++ b/src/printer/dagification_visitor.cpp @@ -53,12 +53,12 @@ bool DagificationVisitor::alreadyVisited(TNode current, TNode parent) { // the count beyond the threshold already, we've done the same // for all subexpressions, so it isn't useful to traverse and // increment again (they'll be dagified anyway). - return current.getMetaKind() == kind::metakind::VARIABLE || - current.getMetaKind() == kind::metakind::CONSTANT || + return current.isVar() || + current.isConst() || ( ( current.getKind() == kind::NOT || current.getKind() == kind::UMINUS ) && - ( current[0].getMetaKind() == kind::metakind::VARIABLE || - current[0].getMetaKind() == kind::metakind::CONSTANT ) ) || + ( current[0].isVar() || + current[0].isConst() ) ) || current.getKind() == kind::SORT_TYPE || d_nodeCount[current] > d_threshold; } diff --git a/src/printer/smt2/smt2_printer.cpp b/src/printer/smt2/smt2_printer.cpp index 892de551c..dcb37d3d9 100644 --- a/src/printer/smt2/smt2_printer.cpp +++ b/src/printer/smt2/smt2_printer.cpp @@ -80,7 +80,7 @@ void Smt2Printer::toStream(std::ostream& out, TNode n, } // variable - if(n.getMetaKind() == kind::metakind::VARIABLE) { + if(n.isVar()) { string s; if(n.getAttribute(expr::VarNameAttr(), s)) { out << s; @@ -102,7 +102,7 @@ void Smt2Printer::toStream(std::ostream& out, TNode n, } // constant - if(n.getMetaKind() == kind::metakind::CONSTANT) { + if(n.isConst()) { switch(n.getKind()) { case kind::TYPE_CONSTANT: switch(n.getConst<TypeConstant>()) { |