CVS difference for ais/ai-00397.txt

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

--- ais/ai-00397.txt	2005/04/13 05:37:21	1.4
+++ ais/ai-00397.txt	2005/05/10 03:49:18	1.5
@@ -1,4 +1,5 @@
-!standard 6.3.1(24)                                    05-04-05  AI95-00397/03
+!standard 6.3.1(24)                                    05-05-05  AI95-00397/04
+!standard 8.3(26)
 !standard 9.1(9.1)
 !standard 9.4(11)
 !standard 9.5.2(2)
@@ -52,6 +53,12 @@
 convention as protected operations.
 
 
+Modify the first paragraph added after 8.3(26) by AI-218-3 as follows:
+
+If a subprogram_declaration {other than a protected subprogram},
+abstract_subprogram, ...
+
+
 Replace the second paragraph inserted by AI95-00345 after 9.1(9.1/1) by:
 
 For a task_type_declaration, if the first parameter of a primitive inherited
@@ -120,6 +127,11 @@
    [overriding_indicator]
    entry defining_identifier [(discrete_subtype_definition)] parameter_profile;
 
+Add after 9.5.2(10):
+
+   An overriding_indicator is not allowed in an entry_declaration that includes
+   a discrete_subtype_definition.
+
 Add after 9.5.2(13):
 
 If an entry_declaration has an overriding_indicator, then:
@@ -186,6 +198,16 @@
 and mode conformance, the convention of a prefixed view profile is considered
 to match that of either an entry or a protected operation.
 
+!corrigendum 8.3(26)
+!comment This is a dummy just to cause a conflict.
+
+@dinsa
+@dinss
+If a @fa<subprogram_declaration> {other than a protected subprogram},
+@fa<abstract_subprogram>, ...
+
+
+
 !corrigendum 9.1(9.1/1)
 !comment This includes the wording change from AI-401 (deleting a paragraph).
 
@@ -294,6 +316,14 @@
 @xcode<@fa<entry_declaration ::=
    [overriding_indicator]
    @b<entry> defining_identifier [(discrete_subtype_definition)] parameter_profile;>>
+
+!corrigendum 9.5.2(10)
+
+@dinsa
+An @fa<entry_declaration> is allowed only in a protected or task declaration.
+@dinst
+An @fa<overriding_indicator> is not allowed in an @fa<entry_declaration> that
+includes a @fa<discrete_subtype_definition>.
 
 !corrigendum 9.5.2(13)
 

Questions? Ask the ACAA Technical Agent