CVS difference for ais/ai-10260.txt

Differences between 1.11 and version 1.12
Log of other versions for file ais/ai-10260.txt

--- ais/ai-10260.txt	2005/08/21 06:00:42	1.11
+++ ais/ai-10260.txt	2005/10/31 05:18:46	1.12
@@ -1,4 +1,4 @@
-!standard  3.09  (06)                               05-08-08  AI95-00260-02/06
+!standard  3.09  (06)                               05-10-10  AI95-00260-02/07
 !standard  3.09  (07)
 !standard  3.09  (12)
 !standard  3.09  (18)
@@ -91,9 +91,9 @@
             return T is abstract;
     function Ada.Tags.Generic_Dispatching_Constructor
        (The_Tag : Tag;
-        Params : access Parameters) return T'Class;
-    pragma Preelaborate (Generic_Dispatching_Constructor);
-    pragma Convention (Intrinsic, Generic_Dispatching_Constructor);
+        Params  : access Parameters) return T'Class;
+    pragma Preelaborate(Generic_Dispatching_Constructor);
+    pragma Convention(Intrinsic, Generic_Dispatching_Constructor);
 
 Tags.Generic_Dispatching_Constructor
 provides a mechanism to create an object of an appropriate type from just a tag
@@ -118,7 +118,7 @@
 An instance of Tags.Generic_Dispatching_Constructor raises Tag_Error if
 The_Tag does not represent a concrete descendant of T.
 Otherwise, it dispatches to the primitive function denoted by the formal
-Constructor for the type identified by the tag The_Tag, passing Params, and
+Constructor for the type identified by The_Tag, passing Params, and
 returns the result. Any exception raised by the function is propagated.
 
 AARM Note (Ramification): The tag check checks both that The_Tag is in T'Class,
@@ -166,7 +166,7 @@
 Change the first sentence of 3.9.3(3):
 
 A subprogram declared by an abstract_subprogram_declaration (see 6.1) or
-declared by a formal_abstract_subprogram_declaration (see 12.6) is an abstract
+a formal_abstract_subprogram_declaration (see 12.6) is an abstract
 subprogram.
 
 Replace the first sentence of 3.9.3(11) by:
@@ -178,8 +178,8 @@
 
 Replace 12.6(2) by:
 
-formal_subprogram_declaration ::= formal_abstract_subprogram_declaration
-   | formal_concrete_subprogram_declaration
+formal_subprogram_declaration ::= formal_concrete_subprogram_declaration
+   | formal_abstract_subprogram_declaration
 formal_concrete_subprogram_declaration ::=
      with subprogram_specification [is subprogram_default];
 formal_abstract_subprogram_declaration ::=
@@ -609,9 +609,9 @@
         @b<return> T @b<is abstract>;
 @b<function> Ada.Tags.Generic_Dispatching_Constructor
    (The_Tag : Tag;
-    Params : @b<access> Parameters) @b<return> T'Class;
-@b<pragma> Preelaborate (Generic_Dispatching_Constructor);
-@b<pragma> Convention (Intrinsic, Generic_Dispatching_Constructor);>
+    Params  : @b<access> Parameters) @b<return> T'Class;
+@b<pragma> Preelaborate(Generic_Dispatching_Constructor);
+@b<pragma> Convention(Intrinsic, Generic_Dispatching_Constructor);>
 
 Tags.Generic_Dispatching_Constructor
 provides a mechanism to create an object of an appropriate type from just a tag
@@ -631,7 +631,7 @@
 raises Tag_Error if The_Tag does not
 represent a concrete descendant of T.
 Otherwise, it dispatches to the primitive function denoted by the formal
-Constructor for the type identified by the tag The_Tag, passing Params, and
+Constructor for the type identified by The_Tag, passing Params, and
 returns the result. Any exception raised by the function is propagated.
 
 @i<@s8<Erroneous Execution>>
@@ -730,7 +730,7 @@
 type, then the tagged type shall be abstract.
 @dby
 A subprogram declared by an @fa<abstract_subprogram_declaration> (see 6.1) or
-declared by a @fa<formal_abstract_subprogram_declaration> (see 12.6)
+a @fa<formal_abstract_subprogram_declaration> (see 12.6)
 is an @i<abstract subprogram>. If it is a primitive subprogram of a tagged type,
 then the tagged type shall be abstract.
 
@@ -754,8 +754,8 @@
 @drepl
 @xcode<@fa<formal_subprogram_declaration ::= >@ft<@b<with>>@fa< subprogram_specification [>@ft<@b<is>>@fa< subprogram_default];>>
 @dby
-@xcode<@fa<formal_subprogram_declaration ::= formal_abstract_subprogram_declaration
-   | formal_concrete_subprogram_declaration
+@xcode<@fa<formal_subprogram_declaration ::= formal_concrete_subprogram_declaration
+   | formal_abstract_subprogram_declaration
 formal_concrete_subprogram_declaration ::=
      >@ft<@b<with>>@fa< subprogram_specification [>@ft<@b<is>>@fa< subprogram_default];
 formal_abstract_subprogram_declaration ::=
@@ -909,6 +909,17 @@
 > can't use the features together.
 
 I very much agree with that sentiment.
+
+****************************************************************
+
+From: Christoph Grein
+Sent: Tuesday, February 22, 2005  4:35 AM
+
+Ada 2005 Amendment 1 (Draft 10)
+
+Section 3.9.3 Abstract Types and Subprograms
+
+In the replacement for paragraph 3, the word "declared" appears twice.
 
 ****************************************************************
 

Questions? Ask the ACAA Technical Agent