diff options
author | Morgan Deters <mdeters@gmail.com> | 2010-02-22 19:22:56 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2010-02-22 19:22:56 +0000 |
commit | c96d62d41a178e0f524c39a0f73da9b7730dcf0b (patch) | |
tree | 593a1e9f62cc9605ac374df1203e85e437d424d9 /src/expr/node.cpp | |
parent | 9ae657c4568114eb888d9c0b8c27c09586556ff3 (diff) |
undoing improperly-committed revision 232; will re-commit to get "svn blame" correct, etc..
Diffstat (limited to 'src/expr/node.cpp')
-rw-r--r-- | src/expr/node.cpp | 44 |
1 files changed, 6 insertions, 38 deletions
diff --git a/src/expr/node.cpp b/src/expr/node.cpp index 79490d58e..644570b24 100644 --- a/src/expr/node.cpp +++ b/src/expr/node.cpp @@ -97,83 +97,51 @@ Node& Node::operator=(const Node& e) { } Node Node::eqExpr(const Node& right) const { - Assert( NodeManager::currentNM() != NULL, - "There is no current CVC4::NodeManager associated to this thread.\n" - "Perhaps a public-facing function is missing a NodeManagerScope ?" ); - return NodeManager::currentNM()->mkNode(EQUAL, *this, right); } Node Node::notExpr() const { - Assert( NodeManager::currentNM() != NULL, - "There is no current CVC4::NodeManager associated to this thread.\n" - "Perhaps a public-facing function is missing a NodeManagerScope ?" ); - return NodeManager::currentNM()->mkNode(NOT, *this); } Node Node::andExpr(const Node& right) const { - Assert( NodeManager::currentNM() != NULL, - "There is no current CVC4::NodeManager associated to this thread.\n" - "Perhaps a public-facing function is missing a NodeManagerScope ?" ); - return NodeManager::currentNM()->mkNode(AND, *this, right); } Node Node::orExpr(const Node& right) const { - Assert( NodeManager::currentNM() != NULL, - "There is no current CVC4::NodeManager associated to this thread.\n" - "Perhaps a public-facing function is missing a NodeManagerScope ?" ); - return NodeManager::currentNM()->mkNode(OR, *this, right); } Node Node::iteExpr(const Node& thenpart, const Node& elsepart) const { - Assert( NodeManager::currentNM() != NULL, - "There is no current CVC4::NodeManager associated to this thread.\n" - "Perhaps a public-facing function is missing a NodeManagerScope ?" ); - return NodeManager::currentNM()->mkNode(ITE, *this, thenpart, elsepart); } Node Node::iffExpr(const Node& right) const { - Assert( NodeManager::currentNM() != NULL, - "There is no current CVC4::NodeManager associated to this thread.\n" - "Perhaps a public-facing function is missing a NodeManagerScope ?" ); - return NodeManager::currentNM()->mkNode(IFF, *this, right); } Node Node::impExpr(const Node& right) const { - Assert( NodeManager::currentNM() != NULL, - "There is no current CVC4::NodeManager associated to this thread.\n" - "Perhaps a public-facing function is missing a NodeManagerScope ?" ); - return NodeManager::currentNM()->mkNode(IMPLIES, *this, right); } Node Node::xorExpr(const Node& right) const { - Assert( NodeManager::currentNM() != NULL, - "There is no current CVC4::NodeManager associated to this thread.\n" - "Perhaps a public-facing function is missing a NodeManagerScope ?" ); - return NodeManager::currentNM()->mkNode(XOR, *this, right); } -static void indent(ostream & o, int indent) { - for(int i=0; i < indent; i++) { +static void indent(ostream & o, int indent){ + for(int i=0; i < indent; i++) o << ' '; - } } void Node::printAst(ostream & o, int ind) const { indent(o, ind); o << '('; o << getKind(); - if(getKind() == VARIABLE) { + if(getKind() == VARIABLE){ o << ' ' << getId(); - } else if(getNumChildren() >= 1) { - for(Node::iterator child = begin(); child != end(); ++child) { + + }else if(getNumChildren() >= 1){ + for(Node::iterator child = begin(); child != end(); ++child){ o << endl; (*child).printAst(o, ind + 1); } |