Use Hoa\Iterator\Map.

4 files changed, 32 insertions, 12 deletions

diff --git a/Model/Collection.php b/Model/Collection.php
index 3d963dd..f84a507 100644
--- a/Model/Collection.php
+++ b/Model/Collection.php
@@ -51,7 +51,12 @@ from('Hoa')
 /**
  * \Hoa\Iterator\Aggregate
  */
--> import('Iterator.Aggregate');
+-> import('Iterator.Aggregate')
+
+/**
+ * \Hoa\Iterator\Map
+ */
+-> import('Iterator.Map');
 
 }
 
@@ -209,11 +214,11 @@ class          Collection
      * Iterate over all clauses.
      *
      * @access  public
-     * @return  \ArrayIterator
+     * @return  \Hoa\Iterator\Map
      */
     public function getIterator ( ) {
 
-        return new \ArrayIterator($this->_clauses);
+        return new \Hoa\Iterator\Map($this->_clauses);
     }
 
     /**
diff --git a/Model/Declaration.php b/Model/Declaration.php
index b4a7d60..a11d426 100644
--- a/Model/Declaration.php
+++ b/Model/Declaration.php
@@ -51,7 +51,12 @@ from('Hoa')
 /**
  * \Hoa\Iterator\Aggregate
  */
--> import('Iterator.Aggregate');
+-> import('Iterator.Aggregate')
+
+/**
+ * \Hoa\Iterator\Map
+ */
+-> import('Iterator.Map');
 
 }
 
@@ -193,11 +198,11 @@ abstract class Declaration
      * Iterator over local variables.
      *
      * @access  public
-     * @return  \ArrayIterator
+     * @return  \Hoa\Iterator\Map
      */
     public function getIterator ( ) {
 
-        return new \ArrayIterator($this->getLocalVariables());
+        return new \Hoa\Iterator\Map($this->getLocalVariables());
     }
 
     /**
diff --git a/Model/Description.php b/Model/Description.php
index 7e9dace..926d6cb 100644
--- a/Model/Description.php
+++ b/Model/Description.php
@@ -46,7 +46,12 @@ from('Hoa')
 /**
  * \Hoa\Iterator\Aggregate
  */
--> import('Iterator.Aggregate');
+-> import('Iterator.Aggregate')
+
+/**
+ * \Hoa\Iterator\Map
+ */
+-> import('Iterator.Map');
 
 }
 
@@ -147,11 +152,11 @@ class          Description
      * Iterator over examples.
      *
      * @access  public
-     * @return  \ArrayIterator
+     * @return  \Hoa\Iterator\Map
      */
     public function getIterator ( ) {
 
-        return new \ArrayIterator($this->_examples);
+        return new \Hoa\Iterator\Map($this->_examples);
     }
 
     /**
diff --git a/Model/Throwable.php b/Model/Throwable.php
index 3f1149d..739edf7 100644
--- a/Model/Throwable.php
+++ b/Model/Throwable.php
@@ -46,7 +46,12 @@ from('Hoa')
 /**
  * \Hoa\Iterator\Aggregate
  */
--> import('Iterator.Aggregate');
+-> import('Iterator.Aggregate')
+
+/**
+ * \Hoa\Iterator\Map
+ */
+-> import('Iterator.Map');
 
 }
 
@@ -156,11 +161,11 @@ class          Throwable
      * Iterator over exceptions.
      *
      * @access  public
-     * @return  \ArrayIterator
+     * @return  \Hoa\Iterator\Map
      */
     public function getIterator ( ) {
 
-        return new \ArrayIterator($this->getExceptions());
+        return new \Hoa\Iterator\Map($this->getExceptions());
     }
 
     /**