moved implementation for hashiterator to header file, introduced invaliditerator class, valueiterator now uses the hashiterator class internally

1 files changed, 37 insertions, 121 deletions

diff --git a/src/valueiterator.cpp b/src/valueiterator.cpp
index 4fe1ee8..92a2542 100644
--- a/src/valueiterator.cpp
+++ b/src/valueiterator.cpp
@@ -14,30 +14,10 @@
 namespace Php {
 
 /**
- *  Constructor
- *  @param  hashtable       The hashtable to iterate over
- *  @param  first           Should it start at the first position?
+ *  Copy constructor
+ *  @param  that
  */
-ValueIterator::ValueIterator(HashTable *hashtable, bool first) : _table(hashtable)
-{
-    // reset the hash pointer to the internal position
-    if (hashtable && first) 
-    {
-        // move to first position
-        zend_hash_internal_pointer_reset_ex(_table, &_position);
-        
-        // read current data
-        if (read()) return;
-        
-        // data was private, move on
-        operator++();
-    }
-    else
-    {
-        // start with invalid data
-        invalidate();
-    }
-}
+ValueIterator::ValueIterator(const ValueIterator &that) : _impl(that._impl->clone()) {}
 
 /**
  *  Increment position
@@ -45,26 +25,11 @@ ValueIterator::ValueIterator(HashTable *hashtable, bool first) : _table(hashtabl
  */
 ValueIterator &ValueIterator::operator++()
 {
-    // leap out if already on an invalid pos (behind the last pos)
-    if (!_position) return *this;
+    // increment implementation
+    _impl->increment();
     
-    // move the iterator forward
-    if (zend_hash_move_forward_ex(_table, &_position) == SUCCESS)
-    {
-        // read current key and value
-        if (read()) return *this;
-        
-        // data was private or invalid, move further
-        return operator++();
-    }
-    else
-    {
-        // invalidate current position
-        invalidate();
-        
-        // done
-        return *this;
-    }
+    // done
+    return *this;
 }
 
 /**
@@ -73,98 +38,49 @@ ValueIterator &ValueIterator::operator++()
  */
 ValueIterator &ValueIterator::operator--()
 {
-    // leap out if we're not even iterating over a hash table
-    if (!_table) return *this;
+    // decrement implementation
+    _impl->decrement();
     
-    // if position is invalid, it is one position behind the last position
-    if (!_position)
-    {
-        // move to last position
-        zend_hash_internal_pointer_end_ex(_table, &_position);
-    }
-    else if (zend_hash_move_backwards_ex(_table, &_position) == FAILURE)
-    {
-        // invalidate current position
-        invalidate();
-        
-        // done
-        return *this;
-    }
-
-    // read current key and value
-    if (read()) return *this;
-    
-    // data was private, move on
-    return operator--();
+    // done
+    return *this;
 }
 
 /**
- *  Read current key and value
- *  @return bool        true if the object is in a valid position, false otherwise
+ *  Compare with other iterator
+ *  @param  that
+ *  @return bool
  */
-bool ValueIterator::read()
+bool ValueIterator::operator==(const ValueIterator &that) const
 {
-    // zval to read the current key in
-    Value key;
-
-#if PHP_VERSION_ID >= 50500
-
-    // read in the current key
-    zend_hash_get_current_key_zval_ex(_table, key._val, &_position);
-    
-    // if the key is set to NULL, it means that the object is not at a valid position
-    if (key.isNull()) return invalidate();
-    
-#else
-
-    // php 5.3 and php 5.4 need a different implementation because the function
-    // zend_hash_get_current_key_zval_ex is missing in php 5.3, declare variables
-    // we need for storing the key in
-    char *string_key;
-    unsigned int str_len;
-    unsigned long num_key;
-    
-    // get the current key
-    int type = zend_hash_get_current_key_ex(_table, &string_key, &str_len, &num_key, 0, &_position);
-    
-    // if key is not found, the iterator is at an invalid position
-    if (type == HASH_KEY_NON_EXISTANT) return invalidate();
-
-    // numeric keys are the easiest ones
-    if (type == HASH_KEY_IS_LONG) key = (int64_t)num_key;
-    else key = string_key;
-
-#endif
+    return _impl->equals(that._impl.get());
+}
 
-    // iterator is at a valid position, go fetch the data
-    // this is the variable we need for fetching the data
-    zval **value;
-            
-    // retrieve data
-    zend_hash_get_current_data_ex(_table, (void **) &value, &_position);
-    
-    // we can now update the current data
-    _current = std::make_pair<Value,Value>(std::move(key), *value);
+/**
+ *  Compare with other iterator
+ *  @param  that
+ *  @return bool
+ */
+bool ValueIterator::operator!=(const ValueIterator &that) const
+{
+    return !_impl->equals(that._impl.get());
+}
 
-    // if the key is private (it starts with a null character) we should return
-    // false to report that the object is not in a completely valid state
-    return !_current.first.isString() || _current.first.rawValue()[0];
+/**
+ *  Derefecence, this returns a std::pair with the current key and value
+ *  @return std::pair
+ */
+const std::pair<Value,Value> &ValueIterator::operator*() const
+{
+    return _impl->current();
 }
 
 /**
- *  Invalidate the iterator
- *  @return bool        always false
+ *  Dereference, this returns a std::pair with the current key and value
+ *  @return std::pair
  */
-bool ValueIterator::invalidate()
+const std::pair<Value,Value> *ValueIterator::operator->() const
 {
-    // forget current position
-    _position = nullptr;
-    
-    // make the data a pair of null ptrs
-    _current = std::make_pair<Value,Value>(nullptr,nullptr);
-    
-    // done
-    return false;
+    return &_impl->current();
 }
 
 /**