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

--- ai05s/ai05-0295-1.txt	2012/02/18 07:39:40	1.1
+++ ai05s/ai05-0295-1.txt	2012/02/19 01:15:02	1.2
@@ -1,13 +1,16 @@
-!standard  13.1(0)                               12-02-17    AI05-0295-1/01
+!standard  13.1(0)                               12-02-18    AI05-0295-1/02
 !standard   3.8(11)
 !standard  9.10(1)
 !standard  13.1(0.1/1)
+!standard  13.1(8)
 !standard  13.1(9.1/1)
 !standard  13.1(10)
 !standard  13.1(11)
 !standard  13.1(12)
 !standard  13.1(13/1)
 !standard  13.1(13.1/2)
+!standard  13.1(15/1)
+!standard  13.1(15.1/1)
 !standard  13.1(18.2/2)
 !standard  13.1(20)
 !standard  13.1(21)
@@ -108,6 +111,7 @@
       explicitly states the name of the aspect as part of the definition
       of the semantics of the pragma.]
 
+Also, replace "an *aspect of representation*" with "a *representation aspect*".
 
 Replace 13.1 (9.2/3) with:
 
@@ -186,9 +190,19 @@
     If an inherited aspect is confirmed by {an aspect_specification or by}
     a later representation item ...
 
-    Thus the derived type has both a specified confirming and an inherited
+    ... Thus the derived type has both a specified confirming and an inherited
     nonconfirming representation {value}[item]...
 
+Modify 13.1(15.1/3):
+
+     ...directly specified by {aspect_specifications or}
+     operational items that are visible ...
+
+     ... An inherited operational aspect is overridden by a subsequent
+     {aspect_specification or} operational item that
+     specifies the same aspect of the type.
+
+
 Modify AARM 13.1(18.a/1):
 
     Note that {specifying an } representation {aspect}[items] can affect
@@ -345,8 +359,26 @@
 item and an operational aspect value may be specified by either an
 operational item or a pragma.
 
-!comment !corrigendum 13.1(8) was deleted by eliminating the original change.
+!corrigendum 13.1(8)
+
+@drepl
+A representation item @i<directly specifies> an @i<aspect of representation> of
+the entity denoted by the @fa<local_name>, except in the case of a type-related
+representation item, whose @fa<local_name> shall denote a first subtype, and
+which directly specifies an aspect of the subtype's type. A representation item
+that names a subtype is either @i<subtype-specific> (Size and Alignment clauses)
+or @i<type-related> (all others). Subtype-specific aspects may differ for
+different subtypes of the same type.
+@dby
+A representation item @i<directly specifies> a @i<representation aspect> of
+the entity denoted by the @fa<local_name>, except in the case of a type-related
+representation item, whose @fa<local_name> shall denote a first subtype, and
+which directly specifies an aspect of the subtype's type. A representation item
+that names a subtype is either @i<subtype-specific> (Size and Alignment clauses)
+or @i<type-related> (all others). Subtype-specific aspects may differ for
+different subtypes of the same type.
 
+
 !corrigendum 13.1(9.1/1)
 
 @dinsa
@@ -446,6 +478,30 @@
 representation aspect is overridden by a subsequent @fa<aspect_specification>
 or representation item that specifies a different value for the same aspect of
 the type or subtype.
+
+!corrigendum 13.1(15.1/1)
+
+@drepl
+In contrast, whether operational aspects are inherited by an untagged derived
+type depends on each specific aspect. Operational aspects are never inherited
+for a tagged type. When operational aspects are inherited by an untagged
+derived type, aspects that were directly specified by operational items that
+are visible at the point of the derived type declaration, or (in the case
+where the parent is derived) that were inherited by the
+parent type from the grandparent type are inherited. An inherited operational
+aspect is overridden by a subsequent operational item that specifies the same
+aspect of the type.
+@dby
+In contrast, whether operational aspects are inherited by a derived type
+depends on each specific aspect; unless specified, an operational aspect is
+not inherited. When operational aspects are inherited by a derived type,
+aspects that were directly specified by @fa<aspect_specification>s or
+operational items that are visible at the point of the derived type declaration,
+or (in the case where the parent is derived) that were inherited by the parent
+type from the grandparent type are inherited. An inherited operational aspect is
+overridden by a subsequent @fa<aspect_specification> or operational item that
+specifies the same aspect of the type.
+
 
 !corrigedum 13.1(18.2/2)