CVS difference for ai05s/ai05-0212-1.txt

--- ai05s/ai05-0212-1.txt	2011/07/30 06:08:02	1.16
+++ ai05s/ai05-0212-1.txt	2011/09/29 06:34:02	1.17
@@ -1,4 +1,4 @@
-!standard 7.6(4/1)                                  11-07-29  AI05-0212-1/12
+!standard 7.6(4/1)                                  11-09-26  AI05-0212-1/13
 !standard A.18.2(6/2)
 !standard A.18.2(8/2)
 !standard A.18.2(11/2)
@@ -345,8 +345,8 @@
       Program_Error is propagated if any operation (in
       particular, the sequence_of_statements of the loop_statement whose
       iterator_specification denotes this object) tampers with the cursors of
-      Container while the returned object exists. The returned object from
-      Iterate needs finalization.
+      Container while the iterator object exists. The iterator object 
+      needs finalization.
 
 [Note: This wording will need to be adjusted for containers that don't have Next, like
 Maps. The wording will be parallel to that of the existing Iterate procedure.]
@@ -365,8 +365,8 @@
       function when used as a reverse iterator. Program_Error is propagated if
       any operation (in particular, the sequence_of_statements of the
       loop_statement whose iterator_specification denotes this object) tampers
-      with the cursors of Container while the returned object exists. The
-      returned object from Iterate needs finalization.
+      with the cursors of Container while the iterator object exists. The
+      iterator object needs finalization.
 
       AARM Note: Exits are allowed from the loops created using the iterator objects. In
       particular, to stop the iteration at a particular cursor, just add
@@ -384,8 +384,8 @@
       moving the cursor as per the Next function. Program_Error is propagated if
       any operation (in particular, the sequence_of_statements of the
       loop_statement whose iterator_specification denotes this object) tampers
-      with the cursors of Container while the returned object exists. The
-      returned object from Iterate needs finalization.
+      with the cursors of Container while the iterator object exists. The
+      iterator object needs finalization.
 
 
 Instead of the above, the Multiway_Tree containers would have:
@@ -398,8 +398,8 @@
       proceeding in a depth-first order. Program_Error is propagated if any
       operation (in particular, the sequence_of_statements of the loop_statement
       whose iterator_specification denotes this object) tampers with the cursors
-      of Container while the returned object exists. The returned object from
-      Iterate needs finalization.
+      of Container while the iterator object exists. The iterator object
+      needs finalization.
 
    function Iterate_Subtree (Position : in Cursor)
       return Tree_Iterator_Interfaces.Forward_Iterator'Class;
@@ -411,8 +411,7 @@
       propagated. Program_Error is propagated if any operation (in particular,
       the sequence_of_statements of the loop_statement whose iterator_specification denotes
       this object) tampers with the cursors of the container in which the node designated by Position
-      exists while the returned object exists. The returned
-      object from Iterate_Subtree needs finalization.
+      exists while the iterator object exists. The iterator object needs finalization.
 
    function Iterate_Children (Container : in Tree; Parent : in Cursor)
       return Tree_Iterator_Interfaces.Reversible_Iterator'Class;
@@ -427,8 +426,8 @@
       moving the cursor as per the function Previous_Sibling. Program_Error is
       propagated if any operation (in particular, the sequence_of_statements of
       the loop_statement whose iterator_specification denotes this object)
-      tampers with the cursors of Container while the returned object exists.
-      The returned object from Iterate_Children needs finalization.
+      tampers with the cursors of Container while the iterator object exists.
+      The iterator object needs finalization.
 
 Add the following to the Erroneous Execution section of each (unbounded) container package:
 
@@ -1127,8 +1126,8 @@
 Program_Error is propagated if any operation (in
 particular, the @fa<sequence_of_statements> of the @fa<loop_statement> whose
 @fa<iterator_specification> denotes this object) tampers with the cursors of
-Container while the returned object exists. The returned object from
-Iterate needs finalization.>
+Container while the iterator object exists. The iterator object 
+needs finalization.>
 
 @xcode<@b<function> Iterate (Container : @b<in> Vector; Start : @b<in> Cursor)
    @b<return> Vector_Iterator_Interfaces.Reversible_Iterator'Class;>
@@ -1142,8 +1141,8 @@
 function when used as a reverse iterator. Program_Error is propagated if
 any operation (in particular, the @fa<sequence_of_statements> of the
 @fa<loop_statement> whose @fa<iterator_specification> denotes this object) tampers
-with the cursors of Container while the returned object exists. The
-returned object from Iterate needs finalization.>
+with the cursors of Container while the iterator object exists. The
+iterator object needs finalization.>
 
 !corrigendum A.18.2(240/2)
 
@@ -1338,8 +1337,8 @@
 Program_Error is propagated if any operation (in
 particular, the @fa<sequence_of_statements> of the @fa<loop_statement> whose
 @fa<iterator_specification> denotes this object) tampers with the cursors of
-Container while the returned object exists. The returned object from
-Iterate needs finalization.>
+Container while the iterator object exists. The iterator object 
+needs finalization.>
 
 @xcode<@b<function> Iterate (Container : @b<in> List; Start : @b<in> Cursor)
    @b<return> List_Iterator_Interfaces.Reversible_Iterator'Class;>
@@ -1353,8 +1352,8 @@
 function when used as a reverse iterator. Program_Error is propagated if
 any operation (in particular, the @fa<sequence_of_statements> of the
 @fa<loop_statement> whose @fa<iterator_specification> denotes this object) tampers
-with the cursors of Container while the returned object exists. The
-returned object from Iterate needs finalization.>
+with the cursors of Container while the iterator object exists. The
+iterator object needs finalization.>
 
 !corrigendum A.18.3(157/2)
 
@@ -1581,8 +1580,8 @@
 Program_Error is propagated if any operation (in
 particular, the @fa<sequence_of_statements> of the @fa<loop_statement> whose
 @fa<iterator_specification> denotes this object) tampers with the cursors of
-Container while the returned object exists. The returned object from
-Iterate needs finalization.>
+Container while the iterator object exists. The iterator object
+needs finalization.>
 
 
 !corrigendum A.18.6(2/2)
@@ -1694,8 +1693,8 @@
 Program_Error is propagated if any operation (in
 particular, the @fa<sequence_of_statements> of the @fa<loop_statement> whose
 @fa<iterator_specification> denotes this object) tampers with the cursors of
-Container while the returned object exists. The returned object from
-Iterate needs finalization.>
+Container while the iterator object exists. The iterator object
+needs finalization.>
 
 
 !corrigendum A.18.7(18/2)
@@ -1930,8 +1929,8 @@
 Program_Error is propagated if any operation (in
 particular, the @fa<sequence_of_statements> of the @fa<loop_statement> whose
 @fa<iterator_specification> denotes this object) tampers with the cursors of
-Container while the returned object exists. The returned object from
-Iterate needs finalization.>
+Container while the iterator object exists. The iterator object
+needs finalization.>
 
 
 !corrigendum A.18.9(2/2)
@@ -2047,8 +2046,8 @@
 Program_Error is propagated if any operation (in
 particular, the @fa<sequence_of_statements> of the @fa<loop_statement> whose
 @fa<iterator_specification> denotes this object) tampers with the cursors of
-Container while the returned object exists. The returned object from
-Iterate needs finalization.>
+Container while the iterator object exists. The iterator object
+needs finalization.>
 
 
 !corrigendum A.18.10(0)