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

--- ai12s/ai12-0212-1.txt	2018/12/05 01:52:14	1.19
+++ ai12s/ai12-0212-1.txt	2019/01/13 06:35:02	1.20
@@ -1,4 +1,10 @@
-!standard 4.3.5(0)                                  18-11-19  AI12-0212-1/08
+!standard 4.3.5(0)                                  19-01-11  AI12-0212-1/09
+!standard 1.1.4(12)
+!standard 1.1.4(13)
+!standard 2.2(9/5)
+!standard 3.8.1(4)
+!standard 4.3.3(3/2)
+!standard 4.3.3(4)
 !class Amendment 16-12-27
 !status Amendment 1-2012 18-11-19
 !status ARG Approved 5-0-2  18-10-21
@@ -249,7 +255,7 @@
   discrete_choice_list ::= discrete_choice {'|' discrete_choice}
   named_container_aggregate ::= '[' container_element_association_list ']'
 
-Add [ ] to the list of delimiters in 2.2(9/5).
+Add [ ] to the list of character names in 2.1(15) and list of delimiters in 2.2(9/5).
 
 Replace "{|" with "{'|'" in 3.7.1(3), 3.8.1(4), 4.3.1(5), 4.4(3.1/3), 
 and 11.2(3).
@@ -1011,6 +1017,103 @@
 works adequately with or without a "when" clause, but it was pointed out
 that we allow multiple iterated_element_associations, which are
 themselves separated by commas.
+
+!corrigendum 1.1.4(12)
+
+@drepl
+@xbullet<A vertical line separates alternative items unless it occurs 
+immediately after an opening curly bracket, in which case it stands for 
+itself:>
+@dby
+@xbullet<A vertical line separates alternative items:>
+
+!corrigendum 1.1.4(13)
+
+@drepl
+@xcode<@fa<constraint> ::= @fa<scalar_constraint> | @fa<composite_constraint>
+@fa<discrete_choice_list> ::= @fa<discrete_choice> {| @fa<discrete_choice>}>
+@dby
+@xcode<@fa<constraint> ::= @fa<scalar_constraint> | @fa<composite_constraint>>
+
+@xbullet<For symbols used in this notation (square brackets, curly brackets, and
+the vertical line), the symbols when surrounded by ' represent themselves:>
+@xcode<@fa<discrete_choice_list> ::= @fa<discrete_choice> {'|' @fa<discrete_choice>}
+@fa<named_container_aggregate> ::= '[' @fa<container_element_association_list> ']'>
+
+!comment Add [ and ] to the table of characters in 2.1(15). Not doing that here.
+
+!corrigendum 2.2(9)
+
+@drepl
+& @ @  ' @ @  ( @ @  ) @ @  * @ @  + @ @  , @ @  @endash @ @  . @ @  / @ @  : @ @  ; @ @  < @ @  = @ @  @> @ @  |
+@dby
+& @ @  ' @ @  ( @ @  ) @ @  * @ @  + @ @  , @ @  @endash @ @  . @ @  / @ @  : @ @  ; @ @  < @ @  = @ @  @> @ @  @@ @ @  [ @ @  ] @ @  |
+
+!corrigendum 3.8.1(4)
+
+@drepl
+@xcode<@fa<discrete_choice_list>@fa< ::= >@fa<discrete_choice> {| @fa<discrete_choice>}>
+@dby
+@xcode<@fa<discrete_choice_list>@fa< ::= >@fa<discrete_choice> {'|' @fa<discrete_choice>}>
+
+!comment Replace "{|" with "{'|'" in 3.7.1(3), 4.3.1(5), 4.4(3.1/3), and 11.2(3).
+!comment Not making these changes here.
+
+!comment *** TBD: Changes in 4.3.
+
+!corrigendum 4.3.3(3/2)
+
+@drepl
+@xcode<@fa<positional_array_aggregate>@fa< ::= >
+@fa<    (expression, expression {, expression})
+  | (expression {, expression}, >@ft<@b<others>>@fa< =@> expression)
+  | (expression {, expression}, >@ft<@b<others>>@fa< =@> <@>)>>
+@dby
+@xcode<@fa<positional_array_aggregate>@fa< ::= >
+@fa<    (expression, expression {, expression})
+  | (expression {, expression}, >@ft<@b<others>>@fa< =@> expression)
+  | (expression {, expression}, >@ft<@b<others>>@fa< =@> <@>)
+  | '['expression, expression {, expression}']'
+  | '['expression {, expression}, >@ft<@b<others>>@fa< =@> expression']'
+  | '['expression {, expression}, >@ft<@b<others>>@fa< =@> <@>']'>>
+
+!corrigendum 4.3.3(4)
+
+@drepl
+@xcode<@fa<named_array_aggregate>@fa< ::= >
+    (@fa<array_component_association> {, @fa<array_component_association>})>
+@dby
+@xcode<@fa<named_array_aggregate>@fa< ::= >
+     (@fa<array_component_association_list>)
+   | '['@fa<array_component_association_list>']'>
+
+@xcode<@fa<array_component_association_list>@fa< ::= >
+    @fa<array_component_association> {, @fa<array_component_association>}>
+
+!corrigendum 13.1.1(5/3)
+
+@drepl
+An @fa<aspect_mark> identifies an aspect of the entity defined by the
+associated declaration (the @i<associated entity>); the aspect denotes
+an object, a value, an expression, a subprogram, or some other kind of
+entity. If the @fa<aspect_mark> identifies:
+@dby
+An @fa<aspect_mark> identifies an aspect of the entity defined by the
+associated declaration (the @i<associated entity>); the aspect denotes
+an object, a value, an expression, an @fa<aggregate>, a subprogram, or 
+some other kind of entity. If the @fa<aspect_mark> identifies:
+
+!corrigendum 13.1.1(7/3)
+
+@dinsa
+@xbullet<an aspect that is a value or an expression, the @fa<aspect_definition>
+shall be an @fa<expression>. The expected type for the @fa<expression>
+is the type of the identified aspect of the associated entity;>
+@dinst
+@xbullet<an aspect that is an @fa<aggregate>, the aspect definition shall be
+an @fa<expression> that is an @fa<aggregate>, with the form of the
+@fa<aggregate> determined by the identified aspect;>
+
 
 !ASIS