diff options
Diffstat (limited to 'src/expr/node.h')
| -rw-r--r-- | src/expr/node.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/expr/node.h b/src/expr/node.h index 9bb138b21..fd2603ffa 100644 --- a/src/expr/node.h +++ b/src/expr/node.h @@ -67,15 +67,13 @@ class Node { * don't change their arguments, and it's nice to have * const_iterators over them. See notes in .cpp file for * details. */ + // this really does needs to be explicit to avoid hard to track + // errors with Nodes implicitly wrapping NodeValues explicit Node(const NodeValue*); template <unsigned> friend class NodeBuilder; friend class NodeManager; - /** Access to the encapsulated expression. - * @return the encapsulated expression. */ - NodeValue const* operator->() const; - /** * Assigns the expression value and does reference counting. No assumptions * are made on the expression, and should only be used if we know what we are @@ -85,8 +83,8 @@ class Node { */ void assignNodeValue(NodeValue* ev); - typedef NodeValue::iterator ev_iterator; - typedef NodeValue::const_iterator const_ev_iterator; + typedef NodeValue::ev_iterator ev_iterator; + typedef NodeValue::const_ev_iterator const_ev_iterator; inline ev_iterator ev_begin(); inline ev_iterator ev_end(); @@ -161,7 +159,9 @@ inline bool Node::operator<(const Node& e) const { return d_ev->d_id < e.d_ev->d_id; } -inline std::ostream& operator<<(std::ostream& out, const Node& e) { +inline std::ostream& + +operator<<(std::ostream& out, const Node& e) { e.toStream(out); return out; } |