CVS difference for ai12s/ai12-0302-1.txt
--- ai12s/ai12-0302-1.txt 2020/08/01 05:40:52 1.9
+++ ai12s/ai12-0302-1.txt 2020/08/28 03:30:05 1.10
@@ -62,6 +62,28 @@
!standard A.10.1(37)
!standard A.10.1(38)
!standard A.10.1(39)
+!standard A.10.1(41)
+!standard A.10.1(42)
+!standard A.10.1(43)
+!standard A.10.1(44)
+!standard A.10.1(45)
+!standard A.10.1(47)
+!standard A.10.1(48)
+!standard A.10.1(49)
+!standard A.10.1(54)
+!standard A.10.1(55)
+!standard A.10.1(59)
+!standard A.10.1(60)
+!standard A.10.1(65)
+!standard A.10.1(66)
+!standard A.10.1(70)
+!standard A.10.1(71)
+!standard A.10.1(75)
+!standard A.10.1(76)
+!standard A.10.1(81)
+!standard A.10.1(82)
+!standard A.10.1(49.1/2)
+!standard A.10.1(50)
!standard A.10.11(3/2)
!standard A.10.12(3/2)
!standard A.12.1(3/3)
@@ -224,13 +246,13 @@
subprograms may overide with "in [out] <unit_name>" when they refer to
implicit state that is *not* synchronized.
-For operations within a generic, we may want to specify "use null" for certain
-operations we know do not use the generic formals, though that seems relatively
-minor, since in most cases the generic actual won't have any weird Global aspects
-anyway.
+For operations within a generic, we may want to specify Use_Formal => null
+for certain operations we know do not use the generic formals, though that
+seems relatively minor, since in most cases the generic actual won't have any
+weird Global aspects anyway.
For operations that take class-wide parameters, we may want to take advantage
-of the "do" feature defined in H.7 to narrow the effects.
+of the Dispatching aspect feature defined in H.7.1 to narrow the effects.
Note: We do not cover the containers packages here; their Global aspects
are specified as part of AI12-0112-1, which overhauls the contracts of the
@@ -719,18 +741,11 @@
@b<procedure> Ada.Unchecked_Deallocation(X : @b<in out> Name)
@b<with> Preelaborate, Nonblocking, Convention =@> Intrinsic, Global =@> @b<in out synchronized>;>
-!corrigendum 13.13.1(9)
-
-@dinsa
-The Write operation appends Item to the specified stream.
-@dinss
-See the conflict file for the text.
-
!corrigendum 13.11.4(3/3)
@drepl
@xcode<@b<package> System.Storage_Pools.Subpools @b<is>
- @b<pragma< Preelaborate (Subpools);>
+ @b<pragma> Preelaborate (Subpools);>
@dby
@xcode<@b<package> System.Storage_Pools.Subpools
@b<with> Preelaborate, Global =@> @b<in out synchronized> @b<is>>
@@ -781,6 +796,15 @@
@b<with> Global =@> @b<in out all>;>
+!corrigendum 13.13.1(9)
+
+@dinsa
+The Write operation appends Item to the specified stream.
+@dinss
+See the conflict file for the text.
+
+
+
!corrigendum A.4.3(5)
@drepl
@@ -1048,23 +1072,282 @@
!comment A.10.1(37) not provided here.
!comment A.10.1(38) not provided here.
!comment A.10.1(39) not provided here.
+!comment A.10.1(41) not provided here.
+!comment A.10.1(42) not provided here.
+!comment A.10.1(43) not provided here.
+!comment A.10.1(44) not provided here.
+!comment A.10.1(45) not provided here.
+!comment A.10.1(43) not provided here.
+!comment A.10.1(47) not provided here.
+!comment A.10.1(48) not provided here.
+!comment A.10.1(49) not provided here.
+!comment A.10.1(49.1/2) not provided here.
+!comment A.10.1(50) not provided here.
+
+!corrigendum A.10.1(54)
+
+@drepl
+@xcode< @b<procedure> Get(File : @b<in> File_Type;
+ Item : @b<out> Num;
+ Width : @b<in> Field := 0);
+ @b<procedure> Get(Item : @b<out> Num;
+ Width : @b<in> Field := 0);>
+@dby
+@xcode< @b<procedure> Get(File : @b<in> File_Type;
+ Item : @b<out> Num;
+ Width : @b<in> Field := 0)
+ @b<with> Global =@> @b<overriding in out> File;
+ @b<procedure> Get(Item : @b<out> Num;
+ Width : @b<in> Field := 0)
+ @b<with> Global =@> @b<in out all>;>
+
+!corrigendum A.10.1(55)
+
+@drepl
+@xcode< @b<procedure> Put(File : @b<in> File_Type;
+ Item : @b<in> Num;
+ Width : @b<in> Field := Default_Width;
+ Base : @b<in> Number_Base := Default_Base);
+ @b<procedure> Put(Item : @b<in> Num;
+ Width : @b<in> Field := Default_Width;
+ Base : @b<in> Number_Base := Default_Base);
+ @b<procedure> Get(From : @b<in> String;
+ Item : @b<out> Num;
+ Last : @b<out> Positive);
+ @b<procedure> Put(To : @b<out> String;
+ Item : @b<in> Num;
+ Base : @b<in> Number_Base := Default_Base);>
+@dby
+@xcode< @b<procedure> Put(File : @b<in> File_Type;
+ Item : @b<in> Num;
+ Width : @b<in> Field := Default_Width;
+ Base : @b<in> Number_Base := Default_Base)
+ @b<with> Global =@> @b<overriding in out> File;
+ @b<procedure> Put(Item : @b<in> Num;
+ Width : @b<in> Field := Default_Width;
+ Base : @b<in> Number_Base := Default_Base)
+ @b<with> Global =@> @b<in out all>;
+ @b<procedure> Get(From : @b<in> String;
+ Item : @b<out> Num;
+ Last : @b<out> Positive)
+ @b<with> Nonblocking;
+ @b<procedure> Put(To : @b<out> String;
+ Item : @b<in> Num;
+ Base : @b<in> Number_Base := Default_Base)
+ @b<with> Nonblocking;>
+
+!corrigendum A.10.1(59)
+
+@drepl
+@xcode< @b<procedure> Get(File : @b<in> File_Type;
+ Item : @b<out> Num;
+ Width : @b<in> Field := 0);
+ @b<procedure> Get(Item : @b<out> Num;
+ Width : @b<in> Field := 0);>
+@dby
+@xcode< @b<procedure> Get(File : @b<in> File_Type;
+ Item : @b<out> Num;
+ Width : @b<in> Field := 0)
+ @b<with> Global =@> @b<overriding in out> File;
+ @b<procedure> Get(Item : @b<out> Num;
+ Width : @b<in> Field := 0)
+ @b<with> Global =@> @b<in out all>;>
+
+!corrigendum A.10.1(60)
+
+@drepl
+@xcode< @b<procedure> Put(File : @b<in> File_Type;
+ Item : @b<in> Num;
+ Width : @b<in> Field := Default_Width;
+ Base : @b<in> Number_Base := Default_Base);
+ @b<procedure> Put(Item : @b<in> Num;
+ Width : @b<in> Field := Default_Width;
+ Base : @b<in> Number_Base := Default_Base);
+ @b<procedure> Get(From : @b<in> String;
+ Item : @b<out> Num;
+ Last : @b<out> Positive);
+ @b<procedure> Put(To : @b<out> String;
+ Item : @b<in> Num;
+ Base : @b<in> Number_Base := Default_Base);>
+@dby
+@xcode< @b<procedure> Put(File : @b<in> File_Type;
+ Item : @b<in> Num;
+ Width : @b<in> Field := Default_Width;
+ Base : @b<in> Number_Base := Default_Base)
+ @b<with> Global =@> @b<overriding in out> File;
+ @b<procedure> Put(Item : @b<in> Num;
+ Width : @b<in> Field := Default_Width;
+ Base : @b<in> Number_Base := Default_Base)
+ @b<with> Global =@> @b<in out all>;
+ @b<procedure> Get(From : @b<in> String;
+ Item : @b<out> Num;
+ Last : @b<out> Positive)
+ @b<with> Nonblocking;
+ @b<procedure> Put(To : @b<out> String;
+ Item : @b<in> Num;
+ Base : @b<in> Number_Base := Default_Base)
+ @b<with> Nonblocking;>
+
+!corrigendum A.10.1(65)
+
+@drepl
+@xcode< @b<procedure> Get(File : @b<in> File_Type;
+ Item : @b<out> Num;
+ Width : @b<in> Field := 0);
+ @b<procedure> Get(Item : @b<out> Num;
+ Width : @b<in> Field := 0);>
+@dby
+@xcode< @b<procedure> Get(File : @b<in> File_Type;
+ Item : @b<out> Num;
+ Width : @b<in> Field := 0)
+ @b<with> Global =@> @b<overriding in out> File;
+ @b<procedure> Get(Item : @b<out> Num;
+ Width : @b<in> Field := 0)
+ @b<with> Global =@> @b<in out all>;>
+
+!corrigendum A.10.1(66)
+
+@drepl
+@xcode< @b<procedure> Put(File : @b<in> File_Type;
+ Item : @b<in> Num;
+ Fore : @b<in> Field := Default_Fore;
+ Aft : @b<in> Field := Default_Aft;
+ Exp : @b<in> Field := Default_Exp);
+ @b<procedure> Put(Item : @b<in> Num;
+ Fore : @b<in> Field := Default_Fore;
+ Aft : @b<in> Field := Default_Aft;
+ Exp : @b<in> Field := Default_Exp);>
+@dby
+@xcode< @b<procedure> Put(File : @b<in> File_Type;
+ Item : @b<in> Num;
+ Fore : @b<in> Field := Default_Fore;
+ Aft : @b<in> Field := Default_Aft;
+ Exp : @b<in> Field := Default_Exp)
+ @b<with> Global =@> @b<overriding in out> File;
+ @b<procedure> Put(Item : @b<in> Num;
+ Fore : @b<in> Field := Default_Fore;
+ Aft : @b<in> Field := Default_Aft;
+ Exp : @b<in> Field := Default_Exp)
+ @b<with> Global =@> @b<in out all>;>
+
+!corrigendum A.10.1(70)
+
+@drepl
+@xcode< @b<procedure> Get(File : @b<in> File_Type;
+ Item : @b<out> Num;
+ Width : @b<in> Field := 0);
+ @b<procedure> Get(Item : @b<out> Num;
+ Width : @b<in> Field := 0);>
+@dby
+@xcode< @b<procedure> Get(File : @b<in> File_Type;
+ Item : @b<out> Num;
+ Width : @b<in> Field := 0)
+ @b<with> Global =@> @b<overriding in out> File;
+ @b<procedure> Get(Item : @b<out> Num;
+ Width : @b<in> Field := 0)
+ @b<with> Global =@> @b<in out all>;>
+
+!corrigendum A.10.1(71)
+
+@drepl
+@xcode< @b<procedure> Put(File : @b<in> File_Type;
+ Item : @b<in> Num;
+ Fore : @b<in> Field := Default_Fore;
+ Aft : @b<in> Field := Default_Aft;
+ Exp : @b<in> Field := Default_Exp);
+ @b<procedure> Put(Item : @b<in> Num;
+ Fore : @b<in> Field := Default_Fore;
+ Aft : @b<in> Field := Default_Aft;
+ Exp : @b<in> Field := Default_Exp);>
+@dby
+@xcode< @b<procedure> Put(File : @b<in> File_Type;
+ Item : @b<in> Num;
+ Fore : @b<in> Field := Default_Fore;
+ Aft : @b<in> Field := Default_Aft;
+ Exp : @b<in> Field := Default_Exp)
+ @b<with> Global =@> @b<overriding in out> File;
+ @b<procedure> Put(Item : @b<in> Num;
+ Fore : @b<in> Field := Default_Fore;
+ Aft : @b<in> Field := Default_Aft;
+ Exp : @b<in> Field := Default_Exp)
+ @b<with> Global =@> @b<in out all>;>
+
+!corrigendum A.10.1(75)
+
+@drepl
+@xcode< @b<procedure> Get(File : @b<in> File_Type;
+ Item : @b<out> Num;
+ Width : @b<in> Field := 0);
+ @b<procedure> Get(Item : @b<out> Num;
+ Width : @b<in> Field := 0);>
+@dby
+@xcode< @b<procedure> Get(File : @b<in> File_Type;
+ Item : @b<out> Num;
+ Width : @b<in> Field := 0)
+ @b<with> Global =@> @b<overriding in out> File;
+ @b<procedure> Get(Item : @b<out> Num;
+ Width : @b<in> Field := 0)
+ @b<with> Global =@> @b<in out all>;>
+
+!corrigendum A.10.1(76)
+
+@drepl
+@xcode< @b<procedure> Put(File : @b<in> File_Type;
+ Item : @b<in> Num;
+ Fore : @b<in> Field := Default_Fore;
+ Aft : @b<in> Field := Default_Aft;
+ Exp : @b<in> Field := Default_Exp);
+ @b<procedure> Put(Item : @b<in> Num;
+ Fore : @b<in> Field := Default_Fore;
+ Aft : @b<in> Field := Default_Aft;
+ Exp : @b<in> Field := Default_Exp);>
+@dby
+@xcode< @b<procedure> Put(File : @b<in> File_Type;
+ Item : @b<in> Num;
+ Fore : @b<in> Field := Default_Fore;
+ Aft : @b<in> Field := Default_Aft;
+ Exp : @b<in> Field := Default_Exp)
+ @b<with> Global =@> @b<overriding in out> File;
+ @b<procedure> Put(Item : @b<in> Num;
+ Fore : @b<in> Field := Default_Fore;
+ Aft : @b<in> Field := Default_Aft;
+ Exp : @b<in> Field := Default_Exp)
+ @b<with> Global =@> @b<in out all>;>
+
+!corrigendum A.10.1(81)
+
+@drepl
+@xcode< @b<procedure> Get(File : @b<in> File_Type;
+ Item : @b<out> Enum);
+ @b<procedure> Get(Item : @b<out> Enum);>
+@dby
+@xcode< @b<procedure> Get(File : @b<in> File_Type;
+ Item : @b<out> Enum)
+ @b<with> Global =@> @b<overriding in out> File;
+ @b<procedure> Get(Item : @b<out> Enum)
+ @b<with> Global =@> @b<in out all>;>
+
+!corrigendum A.10.1(82)
+
+@drepl
+@xcode< @b<procedure> Put(File : @b<in> File_Type;
+ Item : @b<in> Enum;
+ Width : @b<in> Field := Default_Width;
+ Set : @b<in> Type_Set := Default_Setting);
+ @b<procedure> Put(Item : @b<in> Enum;
+ Width : @b<in> Field := Default_Width;
+ Set : @b<in> Type_Set := Default_Setting);>
+@dby
+@xcode< @b<procedure> Put(File : @b<in> File_Type;
+ Item : @b<in> Enum;
+ Width : @b<in> Field := Default_Width;
+ Set : @b<in> Type_Set := Default_Setting)
+ @b<with> Global =@> @b<overriding in out> File;
+ @b<procedure> Put(Item : @b<in> Enum;
+ Width : @b<in> Field := Default_Width;
+ Set : @b<in> Type_Set := Default_Setting)
+ @b<with> Global =@> @b<in out all>;>
-
-Within A.10.1, Text_IO:
-
-Modify current input/output versions of:
-
- Put, Get, Put_Line, Get_Line, Look_Ahead, Get_Immediate
-
-to have:
- with Global => in out all;
-
-Modify File_Type versions of
-
- Put, Get, Put_Line, Get_Line, Look_Ahead, Get_Immediate
-
-to have
- with Global => overriding in out File;
!comment A.10.11(3/2) is not provided here.
!comment A.10.12(3/2) is not provided here.
Questions? Ask the ACAA Technical Agent