diff options
author | Morgan Deters <mdeters@gmail.com> | 2009-12-17 18:48:39 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2009-12-17 18:48:39 +0000 |
commit | 7eb18a6c4b0ec6fcf4b6474d22307baa04f8f515 (patch) | |
tree | 8621e2e60756ec6770bc949877eef808e7e99d55 /src/expr/node.cpp | |
parent | 3b06265b82d48074b3b733d655efd6dab6481150 (diff) |
+ test infrastructure fixes
+ regenerate configure script
+ add CVC4::Message output class
+ add some IllegalArgument() assertion things
+ rename NodeManager::mkExpr() to mkNode()
Diffstat (limited to 'src/expr/node.cpp')
-rw-r--r-- | src/expr/node.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/expr/node.cpp b/src/expr/node.cpp index 40dd70457..334cf1b0e 100644 --- a/src/expr/node.cpp +++ b/src/expr/node.cpp @@ -87,35 +87,35 @@ uint64_t Node::hash() const { } Node Node::eqExpr(const Node& right) const { - return NodeManager::currentNM()->mkExpr(EQUAL, *this, right); + return NodeManager::currentNM()->mkNode(EQUAL, *this, right); } Node Node::notExpr() const { - return NodeManager::currentNM()->mkExpr(NOT, *this); + return NodeManager::currentNM()->mkNode(NOT, *this); } Node Node::andExpr(const Node& right) const { - return NodeManager::currentNM()->mkExpr(AND, *this, right); + return NodeManager::currentNM()->mkNode(AND, *this, right); } Node Node::orExpr(const Node& right) const { - return NodeManager::currentNM()->mkExpr(OR, *this, right); + return NodeManager::currentNM()->mkNode(OR, *this, right); } Node Node::iteExpr(const Node& thenpart, const Node& elsepart) const { - return NodeManager::currentNM()->mkExpr(ITE, *this, thenpart, elsepart); + return NodeManager::currentNM()->mkNode(ITE, *this, thenpart, elsepart); } Node Node::iffExpr(const Node& right) const { - return NodeManager::currentNM()->mkExpr(IFF, *this, right); + return NodeManager::currentNM()->mkNode(IFF, *this, right); } Node Node::impExpr(const Node& right) const { - return NodeManager::currentNM()->mkExpr(IMPLIES, *this, right); + return NodeManager::currentNM()->mkNode(IMPLIES, *this, right); } Node Node::xorExpr(const Node& right) const { - return NodeManager::currentNM()->mkExpr(XOR, *this, right); + return NodeManager::currentNM()->mkNode(XOR, *this, right); } }/* CVC4 namespace */ |