diff options
author | Morgan Deters <mdeters@gmail.com> | 2009-12-16 23:30:21 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2009-12-16 23:30:21 +0000 |
commit | 426b8722e6e32f7fab46769e4d71184bf510fd0e (patch) | |
tree | 8a6fa139a7a599c5a659100df12f0efdc838028d /src/expr/node_value.cpp | |
parent | b33a35b720059370ffb1507f31603cdb5347503a (diff) |
+ refactoring fixes for expr package based on code review (see bug #4)
+ minor autogen/configure fixes for old versions of autotools
Diffstat (limited to 'src/expr/node_value.cpp')
-rw-r--r-- | src/expr/node_value.cpp | 47 |
1 files changed, 7 insertions, 40 deletions
diff --git a/src/expr/node_value.cpp b/src/expr/node_value.cpp index 7af2cd2b5..42b7b05e4 100644 --- a/src/expr/node_value.cpp +++ b/src/expr/node_value.cpp @@ -41,22 +41,21 @@ uint64_t NodeValue::hash() const { return computeHash(d_kind, ev_begin(), ev_end()); } -NodeValue* NodeValue::inc() { +void NodeValue::inc() { // FIXME multithreading - if(d_rc < MAX_RC) + if(EXPECT_TRUE( d_rc < MAX_RC )) { ++d_rc; - return this; + } } -NodeValue* NodeValue::dec() { +void NodeValue::dec() { // FIXME multithreading - if(d_rc < MAX_RC) { - if(--d_rc == 0) { + if(EXPECT_TRUE( d_rc < MAX_RC )) { + --d_rc; + if(EXPECT_FALSE( d_rc == 0 )) { // FIXME gc - return 0; } } - return this; } NodeValue::iterator NodeValue::begin() { @@ -67,14 +66,6 @@ NodeValue::iterator NodeValue::end() { return node_iterator(d_children + d_nchildren); } -NodeValue::iterator NodeValue::rbegin() { - return node_iterator(d_children + d_nchildren - 1); -} - -NodeValue::iterator NodeValue::rend() { - return node_iterator(d_children - 1); -} - NodeValue::const_iterator NodeValue::begin() const { return const_node_iterator(d_children); } @@ -83,14 +74,6 @@ NodeValue::const_iterator NodeValue::end() const { return const_node_iterator(d_children + d_nchildren); } -NodeValue::const_iterator NodeValue::rbegin() const { - return const_node_iterator(d_children + d_nchildren - 1); -} - -NodeValue::const_iterator NodeValue::rend() const { - return const_node_iterator(d_children - 1); -} - NodeValue::ev_iterator NodeValue::ev_begin() { return d_children; } @@ -99,14 +82,6 @@ NodeValue::ev_iterator NodeValue::ev_end() { return d_children + d_nchildren; } -NodeValue::ev_iterator NodeValue::ev_rbegin() { - return d_children + d_nchildren - 1; -} - -NodeValue::ev_iterator NodeValue::ev_rend() { - return d_children - 1; -} - NodeValue::const_ev_iterator NodeValue::ev_begin() const { return d_children; } @@ -115,14 +90,6 @@ NodeValue::const_ev_iterator NodeValue::ev_end() const { return d_children + d_nchildren; } -NodeValue::const_ev_iterator NodeValue::ev_rbegin() const { - return d_children + d_nchildren - 1; -} - -NodeValue::const_ev_iterator NodeValue::ev_rend() const { - return d_children - 1; -} - string NodeValue::toString() const { stringstream ss; toStream(ss); |