CVS difference for ais/ai-00401.txt

Differences between 1.3 and version 1.4
Log of other versions for file ais/ai-00401.txt

--- ais/ai-00401.txt	2005/04/13 05:37:22	1.3
+++ ais/ai-00401.txt	2005/04/14 22:16:11	1.4
@@ -1,4 +1,4 @@
-!standard 3.4(01)                                      05-03-01  AI95-00401/02
+!standard 3.4(01)                                      05-04-13  AI95-00401/03
 !standard 3.4(03)
 !standard 3.4(05)
 !standard 3.4(08)
@@ -76,10 +76,9 @@
 Change 3.4(3) to read:
 
 An interface_subtype_mark in an interface_list names a *progenitor
-subtype*; its type is the progenitor type.
-
-The parent_subtype_indication defines the parent subtype; its type is the
-parent type. A derived type has one parent type and zero or more {progenitor}
+subtype*; its type is the *progenitor type*.
+The parent_subtype_indication defines the *parent subtype*; its type is the
+*parent type*. A derived type has one parent type and zero or more {progenitor}
 types.
 
 
@@ -149,7 +148,8 @@
 performed; the normal conversion of each actual parameter to the subtype of the
 corresponding formal parameter (see 6.4.1) performs any necessary type
 conversion as well. If the result type of the inherited subprogram is the
-derived type, the result of calling the parent {or progenitor}'s subprogram is
+derived type, the result of calling the {subprogram of the parent or
+progenitor} is
 converted to the derived type, or in the case of a null extension, extended to
 the derived type using the equivalent of an extension_aggregate with the
 original result as the ancestor_part and null record as the
@@ -243,9 +243,12 @@
 !corrigendum 3.4(01)
 
 @drepl
-A @fa<derived_type_definition> defines a new type (and its first subtype) whose characteristics are @i<derived> from those of a @i<parent type>.
+A @fa<derived_type_definition> defines a new type (and its first subtype) whose
+characteristics are @i<derived> from those of a @i<parent type>.
 @dby
-A @fa<derived_type_definition> defines a new type (and its first subtype) whose characteristics are @i<derived> from those of a @i<parent type>, and possibly from @i<progenitor types>.
+A @fa<derived_type_definition> defines a new type (and its first subtype) whose
+characteristics are @i<derived> from those of a parent type, and possibly
+from progenitor types.
 
 !corrigendum 3.4(03)
 
@@ -254,9 +257,9 @@
 is the parent type.
 @dby
 An @i<interface>@fa<_subtype_mark> in an @fa<interface_list> names a
-@i<progenitor subtype>; its type is the progenitor type. The
+@i<progenitor subtype>; its type is the @i<progenitor type>. The
 @i<parent>@fa<_subtype_indication> defines @i<the parent subtype>; its type is
-the parent type.
+the @i<parent type>.
 
 A derived type has one parent type and zero or more progenitor types.
 
@@ -372,10 +375,10 @@
 performed; the normal conversion of each actual parameter to the subtype of the
 corresponding formal parameter (see 6.4.1) performs any necessary type
 conversion as well. If the result type of the inherited subprogram is the
-derived type, the result of calling the parent or progenitor's subprogram is
-converted to the derived type, or in the case of a null extension, extended to
-the derived type using the equivalent of an @fa<extension_aggregate> with the
-original result as the @fa<ancestor_part> and @b<null record> as the
+derived type, the result of calling the subprogram of the parent or progenitor
+is converted to the derived type, or in the case of a null extension, extended
+to the derived type using the equivalent of an @fa<extension_aggregate> with
+the original result as the @fa<ancestor_part> and @b<null record> as the
 @fa<record_component_association_list>.
 
 !corrigendum 3.4(35)
@@ -441,7 +444,7 @@
 corresponding declaration of a record extension given in the private part need
 not be the same @emdash the only requirement is that the private extension must
 be descended from each interface from which the record extension is
-descended.]}
+descended.>>
 
 !corrigendum 9.1(9.1/1)
 

Questions? Ask the ACAA Technical Agent