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

--- ai05s/ai05-0134-1.txt	2009/03/10 06:08:57	1.2
+++ ai05s/ai05-0134-1.txt	2009/06/02 06:16:49	1.3
@@ -1,4 +1,4 @@
-!standard 6.3.1(18)                                              09-03-09  AI05-0134-1/02
+!standard 6.3.1(18)                                              09-05-31  AI05-0134-1/03
 !class binding interpretation 09-01-24
 !status Amendment 201Z 09-03-09
 !status ARG Approved  9-0-0  09-02-21
@@ -44,13 +44,16 @@
 
 !wording
 
-Modify 6.3.1(18): [Note: The wording change of AI005-0046-1 is included here.]
+Replace 6.3.1(18) by: [Note: The wording change of AI005-0046-1 is included here.]
 
-Two profiles are fully conformant if they are subtype-conformant, and corresponding
-parameters have the same names{,}[ and] both or neither have null_exclusions{,}[ and]
-they have default_expressions that are fully conformant with one another{ and, for
-access-to-subprogram parameters or access-to-subprogram results, the designated
-profiles are fully conformant}.
+Two profiles are fully conformant if they are subtype-conformant, if they have
+access-to-subprogram results whose designated profiles are fully conformant, and
+corresponding parameters have:
+  * the same names; and
+  * both or neither have null_exclusions; and
+  * neither have default_expressions, or they both have default_expressions that
+    are fully conformant with one another; and
+  * for access-to-subprogram parameters, the designated profiles are fully conformant.
 
 !discussion
 
@@ -64,19 +67,26 @@
 case, which default expression would be used in a call would be undefined. That would
 be bad.
 
+It was noted during review that the old wording did not make it clear that either both
+or neither parameters need to have default_expressions, so we added a bit of wording to
+cover that as well.
 
 !corrigendum 6.3.1(18)
 
 @drepl
 Two profiles are @i<fully conformant> if they are subtype-conformant, and corresponding
-parameters have the same names and default_expressions that are fully conformant with
+parameters have the same names and @fa<default_expression>s that are fully conformant with
 one another.
 @dby
-Two profiles are fully conformant if they are subtype-conformant, and corresponding
-parameters have the same names, both or neither have null_exclusions,
-they have default_expressions that are fully conformant with one another and, for
-access-to-subprogram parameters or access-to-subprogram results, the designated
-profiles are fully conformant.
+Two profiles are @i<fully conformant> if they are subtype-conformant, if they have
+access-to-subprogram results whose designated profiles are fully conformant, and
+corresponding parameters have:
+@xbullet<the same names; and>
+@xbullet<both or neither have @fa<null_exclusion>s; and}
+@xbullet<neither have @fa<default_expression>s, or they both have @fa<default_expression>s
+that are fully conformant with one another; and>
+@xbullet<for access-to-subprogram parameters, the designated profiles are fully conformant.>
+
 
 !ACATS Test