node iterator work

1 files changed, 1 insertions, 27 deletions

diff --git a/src/expr/node_value.h b/src/expr/node_value.h
index 2b26b273d..e4fc479b7 100644
--- a/src/expr/node_value.h
+++ b/src/expr/node_value.h
@@ -162,7 +162,7 @@ private:
       return d_i != i.d_i;
     }
 
-    iterator operator++() {
+    iterator& operator++() {
       ++d_i;
       return *this;
     }
@@ -187,12 +187,6 @@ public:
   template <typename T>
   inline iterator<T> end() const;
 
-  template <typename T, Kind kind>
-  inline iterator<T> begin() const;
-
-  template <typename T, Kind kind>
-  inline iterator<T> end() const;
-
   /**
    * Hash this NodeValue.  For hash_maps, hash_sets, etc.. but this is
    * for expr package internal use only at present!  This is likely to
@@ -362,26 +356,6 @@ inline NodeValue::iterator<T> NodeValue::end() const {
   return iterator<T>(d_children + d_nchildren);
 }
 
-template <typename T, Kind kind>
-inline NodeValue::iterator<T> NodeValue::begin() const {
-  if(d_kind != kind) {
-    return iterator<T>(this);
-  }
-  NodeValue* const* firstChild = d_children;
-  if(getMetaKind() == kind::metakind::PARAMETERIZED) {
-    ++firstChild;
-  }
-  return iterator<T>(firstChild);
-}
-
-template <typename T, Kind kind>
-inline NodeValue::iterator<T> NodeValue::end() const {
-  if(d_kind != kind) {
-    return iterator<T>(this + 1);
-  }
-  return iterator<T>(d_children + d_nchildren);
-}
-
 inline bool NodeValue::isBeingDeleted() const {
   return NodeManager::currentNM() != NULL &&
     NodeManager::currentNM()->isCurrentlyDeleting(this);