CVS difference for ais/ai-10318.txt

--- ais/ai-10318.txt	2004/11/25 00:03:47	1.10
+++ ais/ai-10318.txt	2004/12/09 19:55:40	1.11
@@ -1,7 +1,10 @@
-!standard 03.10.02(13)                              04-11-05  AI95-00318-02/07
+!standard 03.10.02(10)                              04-12-04  AI95-00318-02/08
+!standard 03.10.02(13)
 !standard 03.08(14)
 !standard 06.01(13)
+!standard 06.01(23)
 !standard 06.01(24)
+!standard 06.01(28)
 !standard 06.03.01(16)
 !standard 06.05(02)
 !standard 06.05(03)
@@ -165,6 +168,11 @@
 If a record_type_declaration includes the reserved word limited, the type
 is called a *limited record* type.
 
+Replace 3.10.2(10) with:
+
+For any function, the accessibility level of the result object is that of the
+execution of the called function.
+
 Add after 3.10.2(13):
 
     * The accessibility level of the anonymous access type of an access result
@@ -317,7 +325,7 @@
 
 	 return Node : Cell do           -- in a function body, see 3.10.1 for Cell
             Node.Value := Result;
-            Node.Succ := Next_Mode;
+            Node.Succ := Next_Node;
          end return;
 
 The new rule added before 7.5(2) by AI-287 should say:
@@ -650,6 +658,17 @@
 If a @fa<record_type_declaration> includes the reserved word @b<limited>, the
 type is called a @i<limited record> type.
 
+!corrigendum 3.10.2(10)
+
+@drepl
+For a function whose result type is a return-by-reference type, the
+accessibility level of the result object is the same as that of the master that
+elaborated the function body. For any other function, the accessibility level
+of the result object is that of the execution of the called function.
+@dby
+For any function, the accessibility level of the result object is that of the
+execution of the called function.
+
 !corrigendum 3.10.2(13)
 
 @dinsa
@@ -671,6 +690,19 @@
     [formal_part] >@ft<@b<return>>@fa< subtype_mark
   | [formal_part] >@ft<@b<return>>@fa< access_definition>>
 
+!corrigendum 6.1(23)
+
+@drepl
+The nominal subtype of a formal parameter is the subtype denoted by the
+@fa<subtype_mark>, or defined by the @fa<access_definition>, in the
+@fa<parameter_specification>.
+@dby
+The nominal subtype of a formal parameter is the subtype denoted
+by the @fa<subtype_mark>, or
+defined by the @fa<access_definition>, in the @fa<parameter_specification>.
+The nominal subtype of a function result is the subtype
+denoted by the @fa<subtype_mark>, or
+defined by the @fa<access_definition>, in the @fa<parameter_and_result_profile>.
 
 !corrigendum 6.1(24)
 
@@ -689,6 +721,19 @@
 access-to-variable type (see 3.10). Access parameters allow dispatching
 calls to be controlled by access values.
 
+!corrigendum 6.1(28)
+
+@drepl
+@xbullet<For any result, the result subtype.>
+@dby
+@xbullet<For any non-access result, the nominal subtype of the function result.>
+
+@xbullet<For any access result type of an access-to-object type, the
+designated subtype of the result type.>
+
+@xbullet<For any access result type of an access-to-subprogram type, the
+subtypes of the profile of the result type.>
+
 
 !corrigendum 6.3.1(16)
 
@@ -924,7 +969,7 @@
 
 @xcode<@b<return> Node : Cell @b<do>           -- @ft<@i<in a function body, see 3.10.1 for Cell>>
    Node.Value := Result;
-   Node.Succ := Next_Mode;
+   Node.Succ := Next_Node;
 @b<end return>;>
 
 !corrigendum 7.5(2)