CVS difference for ais/conflict.txt

Differences between 1.3 and version 1.4
Log of other versions for file ais/conflict.txt

--- ais/conflict.txt	1999/10/08 23:41:06	1.3
+++ ais/conflict.txt	2000/04/14 01:45:09	1.4
@@ -13,22 +13,22 @@
 The anonymous objects created by function calls and by @fa<aggregate>s are
 finalized no later than the end of the innermost enclosing @fa<declarative_item>
 or @fa<statement>; if that is a @fa<compound_statement>, they are finalized
-before starting the execution of any statement within the
+before starting the execution of any @fa<statement> within the
 @fa<compound_statement>.
 @dby
 If the @fa<object_name> in an @fa<object_renaming_declaration>, or the actual
 parameter for a generic formal @b<in out> parameter in a
-@fa<generic_instantiation>, denotes an anonymous object created by a function
-call, or a subcomponent of it, the anonymous object is not finalized until after
-it is no longer accessible via any name. Otherwise, the anonymous objects
-created by function calls and by @fa<aggregate>s are
-finalized no later than the end of the innermost enclosing @fa<declarative_item>
-or @fa<statement>; if that is a @fa<compound_statement>, they are finalized
-before starting the execution of any statement within the @fa<compound_statement>.
-If a transfer of control or raising of an exception occurs prior to
-performing a finalization of an anonymous object, the anonymous object
-is finalized as part of the finalizations due to be performed for the
-object's innermost enclosing master.
+@fa<generic_instantiation>, denotes any part of an anonymous object created by
+a function call, the anonymous object is not finalized until after
+it is no longer accessible via any name. Otherwise, an anonymous
+object created by a function call or by an @fa<aggregate> is finalized no later
+than the end of the innermost enclosing @fa<declarative_item>
+or @fa<statement>; if that is a @fa<compound_statement>, it is finalized
+before starting the execution of any @fa<statement> within the
+@fa<compound_statement>. If a transfer of control or raising of an exception
+occurs prior to performing a finalization of an anonymous object, the
+anonymous object is finalized as part of the finalizations due to be
+performed for the object's innermost enclosing master.
 
 !corrigendum 8.03 (26)
 !AI-00044
@@ -80,12 +80,13 @@
 declaration it completes. If the renaming-as-body completes that declaration
 before the subprogram it declares is frozen, the profile shall be
 mode-conformant with that of the renamed callable entity and the subprogram
-it declares takes its convention from the renamed subprogram; otherwise the
+it declares takes its convention from the renamed subprogram. Otherwise, the
 profile shall be subtype-conformant with that of the renamed callable entity
 and the convention of the renamed subprogram shall not be Intrinsic.
 A renaming-as-body is illegal if the declaration occurs before the subprogram
-is frozen, and the renaming renames the subprogram itself, either directly or
-indirectly.
+whose declaration it completes is frozen, and the renaming renames the
+subprogram itself, through one or more subprogram renaming declarations,
+none of whose subprograms has been frozen.
 
 !corrigendum 8.05.04 (8)
 !AI-00064
@@ -113,23 +114,8 @@
 @i<@s8<Bounded (Run-Time) Errors>>@hr
 If a subprogram directly or indirectly renames itself, then it is a bounded
 error to call that subprogram. Possible consequences are that Program_Error
-or Storage_Error is raised, or that the call results in an indefinite loop.
+or Storage_Error is raised, or that the call results in infinite recursion.
 
-!corrigendum 10.01.05 (7)
-!AI-00041
-!AI-00199
-
-@dinsa
-Certain program unit pragmas are defined to be @i<library unit pragmas>. The
-name, if any, in a library unit pragma shall denote the declaration of a
-library unit.
-@dinst
-@i<@s8<Static Semantics>>
-
-A library unit pragma that applies to a generic unit does not apply to its
-instances. Any other program unit pragma that applies to a generic unit applies
-to an instance of the generic unless the instance has an overriding pragma.
-
 !corrigendum 13.01(11)
 !AI-00117
 !AI-00137
@@ -155,7 +141,7 @@
 restrictions. The consequences of violating such limitations are
 implementation defined.
 @dinss
-Implementations are permitted to omit restriction checks for code that is
+An implementation is permitted to omit restriction checks for code that is
 recognized at compile time to be unreachable and for which no code is generated.
 
 Whenever enforcement of a restriction is not required prior to
@@ -163,21 +149,21 @@
 execution of a partition to which the restriction applies, provided
 that every execution of the partition would violate the restriction.
 
-!corrigendum A.12.01 (29)
-!AI-00026
+!corrigendum A.12.01 (36)
 !AI-00001
+!AI-00026
 
 @drepl
-The Stream function returns a Stream_Access result from a File_Type
-object, thus allowing the stream-oriented attributes Read, Write, Input, and
-Output to be used on the same file for multiple types.
-@dby
-The Stream function returns a Stream_Access result from a File_Type
-object, thus allowing the stream-oriented attributes Read, Write, Input, and
-Output to be used on the same file for multiple types. Stream propagates
-Status_Error if File is not open. If positioning is supported for the File_Type
-object, then the default implementations of these attributes add one to the
-current index.
+The Flush procedure synchronizes the external file with the internal file (by
+flushing any internal buffers) without closing the file or changing the
+position. Mode_Error is propagated if the mode of the file is In_File.
+@dby
+@s8<@i<Erroneous execution>>@hr
+If the File_Type object passed to the Stream function
+is later closed or finalized, and the stream-oriented attributes are
+subsequently called (explicitly or implicitly) on the Stream_Access value
+returned by Stream, execution is erroneous. This rule applies even if the
+File_Type object was opened again after it was closed.
 
 !corrigendum E.02.02 (9)
 !AI-00004
@@ -191,8 +177,9 @@
 @dby
 An access type declared in the visible part of a remote types or remote
 call interface library unit is called a @i<remote access type>. Such a type
-shall be either an access-to-subprogram type, a general access type that
-designates a class-wide limited private type, or a class-wide private type
-extension whose ancestors are private type extensions and a limited private
-type. A type that is derived from a remote access type is also a remote access
-type.
+shall be:
+@xbullet<An access-to-subprogram type, or>
+@xbullet<A general access type that designates a class-wide limited private type
+or a class-wide private type extension all of whose ancestors are either private
+type extensions or limited private types.>
+A type that is derived from a remote access type is also a remote access type.

Questions? Ask the ACAA Technical Agent