CVS difference for ais/ai-00423.txt

Differences between 1.4 and version 1.5
Log of other versions for file ais/ai-00423.txt

--- ais/ai-00423.txt	2005/05/10 17:31:12	1.4
+++ ais/ai-00423.txt	2005/05/10 17:59:31	1.5
@@ -69,7 +69,7 @@
 !wording
 
 Remove the syntax rule added by AI95-00409 after 8.5.1(2/2) (that's the one
-which make a null exclusion illegal).
+which makes a null exclusion illegal).
 
 Add after 8.5.1(4):
 
@@ -77,8 +77,9 @@
 null_exclusion:
 
 o  if the object_renaming_declaration occurs within the body of a generic unit,
-   the object_name shall only denote a generic formal object of that generic
-   unit if the declaration of that formal object has a null_exclusion;
+   and the object_name denotes a generic formal object of that generic
+   unit, then the declaration of that formal object shall have a
+   null_exclusion;
 
 o  otherwise, the subtype of the object_name shall exclude the null value.
 
@@ -88,9 +89,9 @@
 null_exclusion:
 
 o   if the subprogram_renaming_declaration occurs within the body of a generic
-    unit, the callable_entity_name shall only denote a generic formal subprogram of
-    that generic unit if the corresponding parameter or result type of that
-    formal subprogram has a null_exclusion;
+    unit, and the callable_entity_name denotes a generic formal subprogram of
+    that generic unit, then the corresponding parameter or result type of that
+    formal subprogram shall have a null_exclusion;
 
 o   otherwise, the subtype of the corresponding parameter or result type of the
     renamed callable entity shall exclude the null value.
@@ -126,9 +127,9 @@
 For a formal_object_declaration with an access_definition that has a
 null_exclusion:
 
-o   for an instantiation that occurs within the body of a generic unit, the actual
-    shall only denote a generic formal object of that generic unit if the declaration
-    of that formal object has a null_exclusion;
+o   for an instantiation that occurs within the body of a generic unit, and
+    the actual denotes a generic formal object of that generic unit, then
+    the declaration of that formal object shall have a null_exclusion;
 
 o   otherwise, the subtype of the actual shall exclude the null value.
 
@@ -148,10 +149,10 @@
 For a parameter or result type of the formal_subprogram_declaration that has a
 null_exclusion:
 
-o   for an instantiation that occurs within the body of a generic unit, the actual
-    shall only denote a generic formal subprogram of that generic unit if the
-    corresponding parameter or result type of that formal subprogram has a
-    null_exclusion,
+o   for an instantiation that occurs within the body of a generic unit, and
+    the actual denotes a generic formal subprogram of that generic unit, then
+    the corresponding parameter or result type of that formal subprogram shall
+    have a null_exclusion,
 
 o   otherwise, the subtype of the corresponding parameter or result type of the
     actual shall exclude the null value.

Questions? Ask the ACAA Technical Agent