CVS difference for ai12s/ai12-0295-1.txt

Differences between 1.2 and version 1.3
Log of other versions for file ai12s/ai12-0295-1.txt

--- ai12s/ai12-0295-1.txt	2019/02/22 07:11:00	1.2
+++ ai12s/ai12-0295-1.txt	2019/04/06 05:08:50	1.3
@@ -1,4 +1,4 @@
-!standard 4.2(6)                                     19-02-22  AI12-0295-1/02
+!standard 4.2(6)                                     19-03-19  AI12-0295-1/03
 !standard 4.2(10)
 !standard 4.2(11)
 !standard 3.6.3(1)
@@ -83,7 +83,7 @@
  predecessor of the lower bound.
 
 Modify paragraph 4.2(11):
- For the evaluation of a string_literal of type T, {if its expected type
+ For the evaluation of a string_literal of type T, {if T
  is a one-dimensional array type with a component subtype that is a
  constrained subtype of a character type,} a check is made that the
  value of each character of the string_literal belongs to the component
@@ -112,7 +112,7 @@
 
 For the evaluation of a string_literal with expected type having a
 String_Literal aspect specified, the value is the result of a call on
-the function specified by the aspect, with the parameter being the
+the function specified by the aspect, with the parameter being a
 Wide_Wide_String with lower bound one that corresponds to the literal.
 
 Modify 4.9(26/3):
@@ -170,16 +170,8 @@
      --        To_Varying_String
      --           (Wide_Wide_String'("This is a test"));
 
-!corrigendum 3.6.3(1)
+!comment AI12-0325-1 undoes the change to 3.6.3(1), so it cannot appear here.
 
-@drepl
-A one-dimensional array type whose component type is a character type
-is called a @i<string> type.
-@dby
-A one-dimensional array type whose component type is a character type
-is called a @i<string type>, as is a type with a specified String_Literal
-aspect (see 4.2.1).
-
 !corrigendum 4.2(6)
 
 @drepl
@@ -223,7 +215,7 @@
 range of the index type. The exception Constraint_Error is raised if
 either of these checks fails.
 @dby
-For the evaluation of a @fa<string_literal> of type @i<T>, if its expected type
+For the evaluation of a @fa<string_literal> of type @i<T>, if @i<T>
 is a one-dimensional array type with a component subtype that is a
 constrained subtype of a character type, a check is made that the
 value of each character of the @fa<string_literal> belongs to the component
@@ -239,33 +231,7 @@
 Just enough to cause a conflict; the real changes are in the conflict 
 file.
 
-!corrigendum 4.9(26/3)
-
-@drepl
-A @i<static subtype> is either a @i<static scalar subtype> or a @i<static
-string subtype>. A static scalar subtype is an unconstrained scalar subtype
-whose type is not a descendant of a formal type, or a constrained
-scalar subtype formed by imposing a compatible static constraint on a static
-scalar subtype. A static string subtype is an unconstrained string subtype
-whose index subtype and component subtype are static, or a constrained string
-subtype formed by imposing a compatible static constraint on a static string
-subtype. In any case, the subtype of a generic formal object of mode @b<in
-out>, and the result subtype of a generic formal function, are not static.
-Also, a subtype is not static if any Dynamic_Predicate specifications apply
-to it.
-@dby
-A @i<static subtype> is either a @i<static scalar subtype> or a @i<static
-string subtype>. A static scalar subtype is an unconstrained scalar subtype
-whose type is not a descendant of a formal type, or a constrained scalar 
-subtype formed by imposing a compatible static constraint on a static scalar 
-subtype. A static string subtype is a string subtype that does not have a 
-specified String_Literal aspect, and that is an unconstrained array subtype
-whose index subtype and component subtype are static, or a constrained array
-subtype formed by imposing a compatible static constraint on a static string
-subtype. In any case, the subtype of a generic formal object of mode @b<in
-out>, and the result subtype of a generic formal function, are not static.
-Also, a subtype is not static if any Dynamic_Predicate specifications apply
-to it.
+!comment AI12-0325-1 undoes the change to 4.9(26/3), so it cannot appear here.
 
 !ASIS
 

Questions? Ask the ACAA Technical Agent