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

--- ai05s/ai05-0229-1.txt	2012/01/27 23:23:11	1.26
+++ ai05s/ai05-0229-1.txt	2012/02/19 04:54:05	1.27
@@ -36,6 +36,7 @@
 !standard 11.5(7.2/2)
 !standard 11.6(6)
 !standard 13.1(28/2)
+!standard 13.1.1(0)
 !standard 13.2(1)
 !standard 13.2(2)
 !standard 13.2(3)
@@ -53,7 +54,6 @@
 !standard 13.3(65)
 !standard 13.3(66)
 !standard 13.3(73)
-!standard 13.3.1(0)
 !standard 13.6(1)
 !standard 13.7(14)
 !standard 13.7.1(7)
@@ -412,7 +412,7 @@
 
 ===pragma No_Return (the pragma is to be obsolescent)
 
-Change the title of clause 6.5.1 to "Non-returning Procedures".
+Change the title of clause 6.5.1 to "Nonreturning Procedures".
 
 Modify 6.5.1(1/2):
 
@@ -430,7 +430,7 @@
   representation aspect may be specified:
      No_Return
       The type of aspect No_Return is Boolean. When aspect No_Return is True for
-      an entity, the entity is said to be *non-returning*.
+      an entity, the entity is said to be *nonreturning*.
 
       If directly specified, the aspect_definition shall be a static expression.
       [Redundant: This aspect is never inherited;] if not directly specified, the
@@ -1692,7 +1692,7 @@
 
 Name Resolution Rules
 
-The expected type for a external_name_string_expression and a link_name_string_expression
+The expected type for an external_name_string_expression and a link_name_string_expression
 in an interfacing pragma is String.
 
 Legality Rules
@@ -1805,9 +1805,9 @@
 Name Resolution Rules
 
 The local_name in an Atomic or Volatile pragma shall resolve to denote either
-an object_declaration, a non-inherited component_declaration, or a
+an object_declaration, a noninherited component_declaration, or a
 full_type_declaration. The component_local_name in an Independent pragma shall
-resolve to denote a non-inherited component_declaration. The array_local_name
+resolve to denote a noninherited component_declaration. The array_local_name
 in an Atomic_Components or Volatile_Components pragma shall resolve to denote
 the declaration of an array type or an array object of an anonymous type.
 The local_name in an Independent_Components pragma shall resolve to denote the
@@ -2432,7 +2432,7 @@
 @drepl
 Pragma No_Return
 @dby
-Non-returning Procedures
+Nonreturning Procedures
 
 !corrigendum 6.5.1(1/2)
 
@@ -2462,20 +2462,20 @@
 
 @xhang<@xterm<No_Return>
 The type of aspect No_Return is Boolean. When aspect No_Return is True for
-an entity, the entity is said to be @i<non-returning>.>
+an entity, the entity is said to be @i<nonreturning>.>
 
 @xindent<If directly specified, the @fa<aspect_definition> shall be a static expression.
 This aspect is never inherited; if not directly specified, the aspect is False.>
 
-If a generic procedure is non-returning, then so are its instances. If a procedure
-declared within a generic unit is non-returning, then so are the corresponding copies of
+If a generic procedure is nonreturning, then so are its instances. If a procedure
+declared within a generic unit is nonreturning, then so are the corresponding copies of
 that procedure in instances.
 
 !corrigendum 6.5.1(4/2)
 
 @drepl
 Each @i<procedure_>@fa<local_name> shall denote one or more procedures or generic
-procedures; the denoted entities are @i<non-returning>. The @i<procedure_>@fa<local_name>
+procedures; the denoted entities are @i<nonreturning>. The @i<procedure_>@fa<local_name>
 shall not denote a null procedure nor an instance of a generic unit.
 @dby
 Aspect No_Return shall not be specified for a null procedure nor an
@@ -2484,8 +2484,8 @@
 !corrigendum 6.5.1(8/2)
 
 @ddel
-If a generic procedure is non-returning, then so are its instances. If a procedure
-declared within a generic unit is non-returning, then so are the corresponding copies
+If a generic procedure is nonreturning, then so are its instances. If a procedure
+declared within a generic unit is nonreturning, then so are the corresponding copies
 of that procedure in instances.
 
 !corrigendum 6.5.1(10/2)
@@ -2564,7 +2564,7 @@
 either object is specified as independently addressable (see C.6). Otherwise,
 two nonoverlapping objects are independently addressable
 except when they are both parts of a composite object for which
-a non-confirming representation item is used to specify
+a nonconfirming representation item is used to specify
 record layout, Component_Size, Pack, Atomic, or convention, in which case
 it is unspecified whether the parts are independently addressable.
 
@@ -2722,6 +2722,14 @@
    and are summarized in K.1.>
 
 
+!corrigendum 13.1.1(0)
+!comment Moved by AI05-0295-1
+
+@dinsc
+
+Force a conflict; the real text is found in the conflict file.
+
+
 !corrigendum 13.2(0)
 
 @drepl
@@ -2839,13 +2847,6 @@
 should forbid this combination in cases where it cannot support a no-gaps representation.>
 
 
-!corrigendum 13.3.1(0)
-
-@dinsc
-
-Force a conflict; the real text is found in the conflict file.
-
-
 !corrigendum 13.6(1)
 
 @drepl
@@ -2908,7 +2909,7 @@
 
 @ddel
 The @i<first_subtype_>@fa<local_name> of a @fa<pragma> Controlled shall denote a
-non-derived access subtype.
+nonderived access subtype.
 
 !corrigendum 13.11.3(5)
 
@@ -3579,7 +3580,7 @@
 
 @ddel
 The @fa<local_name> in an Atomic or Volatile pragma shall resolve
-to denote either an @fa<object_declaration>, a non-inherited @fa<component_declaration>,
+to denote either an @fa<object_declaration>, a noninherited @fa<component_declaration>,
 or a @fa<full_type_declaration>. The @i<array_>@fa<local_name> in an
 Atomic_Components or Volatile_Components pragma shall resolve to denote
 the declaration of an array type or an array object of an anonymous type.
@@ -4089,7 +4090,7 @@
 
 @s8<@i<Name Resolution Rules>>
 
-The expected type for a @i<external_name_string_>@fa<expression> and a @i<link_name_string_>@fa<expression>
+The expected type for an @i<external_name_string_>@fa<expression> and a @i<link_name_string_>@fa<expression>
 in an interfacing pragma is String.
 
 @s8<@i<Legality Rules>>
@@ -4211,9 +4212,9 @@
 @s8<@i<Name Resolution Rules>>
 
 The @fa<local_name> in an Atomic or Volatile pragma shall resolve to denote either
-an @fa<object_declaration>, a non-inherited @fa<component_declaration>, or a
+an @fa<object_declaration>, a noninherited @fa<component_declaration>, or a
 @fa<full_type_declaration>. The @i<component_>@fa<local_name> in an Independent
-pragma shall resolve to denote a non-inherited @fa<component_declaration>. The
+pragma shall resolve to denote a noninherited @fa<component_declaration>. The
 @i<array_>@fa<local_name>
 in an Atomic_Components or Volatile_Components pragma shall resolve to denote
 the declaration of an array type or an array object of an anonymous type.