- MFH: Fix handling of recursive inner iterators

helly25 · helly25 · commit 5ea32dc1e455 · 2006-12-01T09:29:15.000Z
diff --git a/ext/spl/examples/dualiterator.inc b/ext/spl/examples/dualiterator.inc
@@ -12,7 +12,7 @@
 /** @ingroup Examples
  * @brief   Synchronous iteration over two iterators
  * @author  Marcus Boerger
- * @version 1.1
+ * @version 1.2
  */
 class DualIterator implements Iterator
 {
@@ -174,6 +174,7 @@ class DualIterator implements Iterator
 			{
 				$it = new RecursiveDualIterator($lhs, $rhs, 
 								self::CURRENT_0 | self::KEY_0);
+				$it = new RecursiveIteratorIterator($it);
 			}
 			else
 			{
@@ -187,7 +188,7 @@ class DualIterator implements Iterator
 
 		if ($identical)
 		{
-			foreach(new RecursiveIteratorIterator($it) as $n)
+			foreach($it as $n)
 			{
 				if (!$it->areIdentical())
 				{

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`/** @ingroup Examples`
`13`	`13`	`* @brief Synchronous iteration over two iterators`
`14`	`14`	`* @author Marcus Boerger`
`15`		`- * @version 1.1`
	`15`	`+ * @version 1.2`
`16`	`16`	`*/`
`17`	`17`	`class DualIterator implements Iterator`
`18`	`18`	`{`
`@@ -174,6 +174,7 @@ class DualIterator implements Iterator`
`174`	`174`	`{`
`175`	`175`	`$it = new RecursiveDualIterator($lhs, $rhs,`
`176`	`176`	`self::CURRENT_0 \| self::KEY_0);`
	`177`	`+ $it = new RecursiveIteratorIterator($it);`
`177`	`178`	`}`
`178`	`179`	`else`
`179`	`180`	`{`
`@@ -187,7 +188,7 @@ class DualIterator implements Iterator`
`187`	`188`
`188`	`189`	`if ($identical)`
`189`	`190`	`{`
`190`		`- foreach(new RecursiveIteratorIterator($it) as $n)`
	`191`	`+ foreach($it as $n)`
`191`	`192`	`{`
`192`	`193`	`if (!$it->areIdentical())`
`193`	`194`	`{`