- Minor fixes

- Implement AppendIterator in C

2 files changed, 0 insertions, 120 deletions

diff --git a/ext/spl/examples/appenditerator.inc b/ext/spl/examples/appenditerator.inc
deleted file mode 100755
index d9edebc123..0000000000
--- a/ext/spl/examples/appenditerator.inc
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-/** @file appenditerator.inc
- * @ingroup Examples
- * @brief class AppendIterator
- * @author  Marcus Boerger
- * @date    2003 - 2004
- *
- * SPL - Standard PHP Library
- */
-
-/** @ingroup Examples
- * @brief   Iterator that iterates over several iterators one after the other
- * @author  Marcus Boerger
- * @version 1.0
- */
-class AppendIterator implements OuterIterator
-{
-	/** @internal array of inner iterators */
-	private $iterators;
-
-	/** Construct an empty AppendIterator
-	 */
-	function __construct()
-	{
-		$this->iterators = new ArrayIterator();
-	}
-
-	/** Append an Iterator
-	 * @param $it Iterator to append
-	 */	
-	function append(Iterator $it)
-	{
-		$this->iterators->append($it);
-	}
-
-	/** @return the current inner Iterator
-	 */
-	function getInnerIterator()
-	{
-		return $this->iterators->current();
-	}
-
-	/** Rewind to the first element of the first inner Iterator.
-	 * @return void
-	 */
-	function rewind()
-	{
-		$this->iterators->rewind();
-		if ($this->iterators->valid())
-		{
-			$this->getInnerIterator()->rewind();
-		}
-	}
-
-	/** @return whether the current element is valid
-	  */
-	function valid()
-	{
-		return $this->iterators->valid() && $this->getInnerIterator()->valid();
-	}
-
-	/** @return the current value if it is valid or \c NULL
-	 */
-	function current()
-	{
-		/* Using $this->valid() would be exactly the same; it would omit
-		 * the access to a non valid element in the inner iterator. Since
-		 * the user didn't respect the valid() return value false this
-		 * must be intended hence we go on. */
-		return $this->iterators->valid() ? $this->getInnerIterator()->current() : NULL;
-	}
-
-	/** @return the current key if it is valid or \c NULL
-	 */
-	function key()
-	{
-		return $this->iterators->valid() ? $this->getInnerIterator()->key() : NULL;
-	}
-
-	/** Move to the next element. If this means to another Iterator that 
-	 * rewind that Iterator.
-	 * @return void
-	 */
-	function next()
-	{
-		if (!$this->iterators->valid())
-		{
-			return; /* done all */
-		}
-		$this->getInnerIterator()->next();
-		if ($this->getInnerIterator()->valid())
-		{
-			return; /* found valid element in current inner iterator */
-		}
-		$this->iterators->next();
-		while ($this->iterators->valid())
-		{
-			$this->getInnerIterator()->rewind();
-			if ($this->getInnerIterator()->valid())
-			{
-				return; /* found element as first elemet in another iterator */
-			}
-			$this->iterators->next();
-		}
-	}
-
-	/** Aggregates the inner iterator
-	 */	
-	function __call($func, $params)
-	{
-		return call_user_func_array(array($this->getInnerIterator(), $func), $params);
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/ext/spl/examples/tests/examples.inc b/ext/spl/examples/tests/examples.inc
index 74b652adb5..feeba7db24 100755
--- a/ext/spl/examples/tests/examples.inc
+++ b/ext/spl/examples/tests/examples.inc
@@ -13,10 +13,6 @@ class IncludeFiles extends ArrayIterator
 }
 
 $classes = array(
-	'EmptyIterator',
-	'InfiniteIterator',
-	'AppendIterator',
-	'NoRewindIterator',
 );
 
 foreach (new IncludeFiles(dirname(__FILE__). '/..', $classes) as $file)