CVS difference for ais/ai-00230.txt

--- ais/ai-00230.txt	2005/05/15 23:40:40	1.24
+++ ais/ai-00230.txt	2005/06/16 23:47:13	1.25
@@ -1,4 +1,4 @@
-!standard 03.04.01(06)                               05-02-24  AI95-00230/16
+!standard 03.04.01(06)                               05-05-16  AI95-00230/17
 !standard 03.02.01(07)
 !standard 03.02.01(08)
 !standard 03.04.01(10)
@@ -303,13 +303,13 @@
    {If the target type is universal_access, then the operand type shall be an
    access type.} If the target type is a general access{-to-object} type, then
    the operand type shall be {universal_access or} an access-to-object type.
-   Further{, if not universal_access}:
+   Further{, if the operand type is not universal_access}:
 
 Change paragraph 4.6(18) as follows:
 
    If the target type is an access-to-subprogram type, then the operand type
    shall be {universal_access or} an access-to-subprogram type. Further{, if
-   not universal_access}:
+   the operand type is not universal_access}:
 
 Change paragraph 4.6(49) as follows:
 
@@ -551,7 +551,7 @@
 Certain other forms of declaration also include type
 definitions as part of the declaration for an object (including a
 parameter or a discriminant). The type defined by such
-a declaration is @i<anonymous> - it has no nameable subtypes.
+a declaration is @i<anonymous> @emdash it has no nameable subtypes.
 For explanatory purposes, this International Standard sometimes refers to
 an anonymous type by a pseudo-name, written in italics, and
 uses such pseudo-names at places where the syntax normally requires
@@ -563,13 +563,13 @@
 such a type has one or more nameable subtypes.
 Certain other forms of declaration also include type
 definitions as part of the declaration for an object. The type defined
-by such a declaration is @i<anonymous> - it has no nameable subtypes.
+by such a declaration is @i<anonymous> @emdash it has no nameable subtypes.
 For explanatory purposes, this International Standard sometimes refers to
 an anonymous type by a pseudo-name, written in italics, and
 uses such pseudo-names at places where the syntax normally requires
 an @fa<identifier>. For a named type whose first subtype is T,
 this International Standard sometimes refers to the type of T
-as simply "the type T."
+as simply "the type T".
 
 !corrigendum 3.2.1(8)
 
@@ -808,14 +808,14 @@
 !corrigendum 3.10.2(34)
 
 @drepl
-@xindent<@s9<82 The predefined operations of an access type also include the
+@xindent<@s9<82  The predefined operations of an access type also include the
 assignment operation, qualification, and membership tests. Explicit conversion
 is allowed between general access types with matching designated subtypes;
 explicit conversion is allowed between access-to-subprogram types with subtype
 conformant profiles (see 4.6). Named access types have predefined equality
 operators; anonymous access types do not (see 4.5.2).>>
 @dby
-@xindent<@s9<82 The predefined operations of an access type also include the
+@xindent<@s9<82  The predefined operations of an access type also include the
 assignment operation, qualification, and membership tests. Explicit conversion
 is allowed between general access types with matching designated subtypes;
 explicit conversion is allowed between access-to-subprogram types with subtype
@@ -887,7 +887,7 @@
 
 If the target type is a general access-to-object type, then
 the operand type shall be @i<universal_access> or an access-to-object type.
-Further, if not @i<universal_access>:
+Further, if the operand type is not @i<universal_access>:
 
 !corrigendum 4.6(18)
 
@@ -897,7 +897,7 @@
 @dby
 If the target type is an access-to-subprogram type, then the operand type
 shall be @i<universal_access> or an access-to-subprogram type. Further, if
-not @i<universal_access>:
+the operand type is not @i<universal_access>:
 
 !corrigendum 4.6(49)
 
@@ -917,15 +917,17 @@
 (explicit) @fa<type_conversion> cannot be the literal @b<null>, an @fa<allocator>,
 an @fa<aggregate>, a @fa<string_literal>, a @fa<character_literal>, or an
 @fa<attribute_reference> for an Access or Unchecked_Access attribute.
-Similarly, such an expression enclosed by parentheses is not allowed. A
-qualified_expression (see 4.7) can be used instead of such a @fa<type_conversion>.>
+Similarly, such an @fa<expression> enclosed by parentheses is not allowed. A
+@fa<qualified_expression> (see 4.7) can be used instead of such a
+@fa<type_conversion>.>
 @dby
 @s9<22  A ramification of the overload resolution rules is that the operand of an
 (explicit) @fa<type_conversion> cannot be an @fa<allocator>,
 an @fa<aggregate>, a @fa<string_literal>, a @fa<character_literal>, or an
 @fa<attribute_reference> for an Access or Unchecked_Access attribute.
-Similarly, such an expression enclosed by parentheses is not allowed. A
-qualified_expression (see 4.7) can be used instead of such a @fa<type_conversion>.>
+Similarly, such an @fa<expression> enclosed by parentheses is not allowed. A
+@fa<qualified_expression> (see 4.7) can be used instead of such a
+@fa<type_conversion>.>
 
 
 !corrigendum 8.5.1(2)
@@ -941,10 +943,10 @@
 !corrigendum 8.5.1(3)
 
 @drepl
-The type of the @fa<object_name> shall resolve to the type determined by the
+The type of the @i<object_>@fa<name> shall resolve to the type determined by the
 @fa<subtype_mark>.
 @dby
-The type of the @fa<object_name> shall resolve to the type determined by
+The type of the @i<object_>@fa<name> shall resolve to the type determined by
 the @fa<subtype_mark>, or in the case where the type is defined by an
 @fa<access_definition>, to a specific anonymous access type whose
 designated type is the same as that of the @fa<access_definition>.