CVS difference for ais/ai-00301.txt

Differences between 1.19 and version 1.20
Log of other versions for file ais/ai-00301.txt

--- ais/ai-00301.txt	2005/06/16 23:47:26	1.19
+++ ais/ai-00301.txt	2005/08/21 06:00:26	1.20
@@ -1,15 +1,21 @@
-!standard A.4.3(8)                                   05-05-05  AI95-00301/13
+!standard A.4.3(8)                                   05-08-10  AI95-00301/14
+!standard A.4.3(10)
+!standard A.4.3(11)
 !standard A.4.3(56)
 !standard A.4.3(58)
 !standard A.4.3(60)
 !standard A.4.4(12)
 !standard A.4.4(28)
 !standard A.4.4(43)
+!standard A.4.4(45)
+!standard A.4.4(46)
 !standard A.4.4(92)
 !standard A.4.4(101/1)
 !standard A.4.5(11)
 !standard A.4.5(22)
 !standard A.4.5(38)
+!standard A.4.5(40)
+!standard A.4.5(41)
 !standard A.4.5(79)
 !standard A.4.5(82)
 !standard A.4.7(40)
@@ -17,6 +23,7 @@
 !standard A.10.1(48)
 !standard A.10.7(17)
 !standard A.10.12(00)
+!standard A.11(02)
 !standard A.11(03)
 !class amendment 02-06-12
 !status Amendment 200Y 04-01-13
@@ -109,6 +116,8 @@
                 Mapping : in Maps.Character_Mapping_Function)
    return Natural;
 
+Add after A.4.3(10):
+
 function Index (Source  : in String;
                 Set     : in Maps.Character_Set;
                 From    : in Positive;
@@ -116,6 +125,8 @@
                 Going   : in Direction := Forward)
    return Natural;
 
+Add after A.4.3(11):
+
 function Index_Non_Blank (Source : in String;
                           From   : in Positive;
                           Going  : in Direction := Forward)
@@ -147,8 +158,8 @@
    at I matches Pattern. If Going = Backward, then Index returns the largest
    index I such that the slice of Source starting at I matches Pattern and has
    an upper bound less than or equal to From.
-   If there is no such slice, then 0 is returned. If Pattern is the null string
-   then Pattern_Error is propagated.
+   If there is no such slice, then 0 is returned. If Pattern is the null
+   string, then Pattern_Error is propagated.
 
    AARM Note: There is no default parameter for From; the default value
    would need to depend on other parameters (the bounds of Source and the
@@ -233,6 +244,8 @@
                 Mapping : in Maps.Character_Mapping_Function)
    return Natural;
 
+Add after A.4.4(45):
+
 function Index (Source  : in Bounded_String;
                 Set     : in Maps.Character_Set;
                 From    : in Positive;
@@ -240,6 +253,8 @@
                 Going   : in Direction := Forward)
    return Natural;
 
+Add after A.4.4(46):
+
 function Index_Non_Blank (Source : in Bounded_String;
                           From   : in Positive;
                           Going  : in Direction := Forward)
@@ -310,6 +325,8 @@
                 Mapping : in Maps.Character_Mapping_Function)
    return Natural;
 
+Add after A.4.5(40):
+
 function Index (Source  : in Unbounded_String;
                 Set     : in Maps.Character_Set;
                 From    : in Positive;
@@ -317,6 +334,8 @@
                 Going   : in Direction := Forward)
    return Natural;
 
+Add after A.4.5(41):
+
 function Index_Non_Blank (Source : in Unbounded_String;
                           From   : in Positive;
                           Going  : in Direction := Forward)
@@ -453,6 +472,8 @@
 
    Equivalent to Item := Get_Line;
 
+In A.11(2), change "procedure" to "subprogram".
+
 Add after A.11(3):
 
 The specification of package Wide_Text_IO.Wide_Unbounded_IO is the same as
@@ -626,20 +647,39 @@
                    From    : @b<in> Positive;
                    Going   : @b<in> Direction := Forward;
                    Mapping : @b<in> Maps.Character_Mapping_Function)
-      @b<return> Natural;
+      @b<return> Natural;>
 
-   @b<function> Index (Source  : @b<in> String;
+!corrigendum A.4.3(10)
+
+@dinsa
+@xcode<   @b<function> Index (Source  : @b<in> String;
+                   Pattern : @b<in> String;
+                   Going   : @b<in> Direction := Forward;
+                   Mapping : @b<in> Maps.Character_Mapping_Function)
+      @b<return> Natural;>
+@dinst
+@xcode<   @b<function> Index (Source  : @b<in> String;
                    Set     : @b<in> Maps.Character_Set;
                    From    : @b<in> Positive;
                    Test    : @b<in> Membership := Inside;
                    Going   : @b<in> Direction := Forward)
-      @b<return> Natural;
+      @b<return> Natural;>
+
+!corrigendum A.4.3(11)
 
-   @b<function> Index_Non_Blank (Source : @b<in> String;
+@dinsa
+@xcode<   @b<function> Index (Source  : @b<in> String;
+                   Set     : @b<in> Maps.Character_Set;
+                   Test    : @b<in> Membership := Inside;
+                   Going   : @b<in> Direction := Forward)
+      @b<return> Natural;>
+@dinsa
+@xcode<   @b<function> Index_Non_Blank (Source : @b<in> String;
                              From   : @b<in> Positive;
                              Going  : @b<in> Direction := Forward)
       @b<return> Natural;>
 
+
 !corrigendum A.4.3(56)
 
 @dinsa
@@ -668,7 +708,7 @@
 Backward, then Index returns the largest index I such that the slice of Source
 starting at I matches Pattern and has an upper bound less than or equal to
 From. If there is no such slice, then 0 is returned. If Pattern is the null
-string then Pattern_Error is propagated.>
+string, then Pattern_Error is propagated.>
 
 !corrigendum A.4.3(58)
 
@@ -774,16 +814,35 @@
                       From    : @b<in> Positive;
                       Going   : @b<in> Direction := Forward;
                       Mapping : @b<in> Maps.Character_Mapping_Function)
-         @b<return> Natural;
+         @b<return> Natural;>
 
-      @b<function> Index (Source  : @b<in> Bounded_String;
+!corrigendum A.4.4(45)
+
+@dinsa
+@xcode<      @b<function> Index (Source  : @b<in> Bounded_String;
+                      Pattern : @b<in> String;
+                      Going   : @b<in> Direction := Forward;
+                      Mapping : @b<in> Maps.Character_Mapping_Function)
+         @b<return> Natural;>
+@dinst
+@xcode<      @b<function> Index (Source  : @b<in> Bounded_String;
                       Set     : @b<in> Maps.Character_Set;
                       From    : @b<in> Positive;
                       Test    : @b<in> Membership := Inside;
                       Going   : @b<in> Direction := Forward)
-         @b<return> Natural;
+         @b<return> Natural;>
+
 
-      @b<function> Index_Non_Blank (Source : @b<in> Bounded_String;
+!corrigendum A.4.4(46)
+
+@dinsa
+@xcode<      @b<function> Index (Source  : @b<in> Bounded_String;
+                      Set     : @b<in> Maps.Character_Set;
+                      Test    : @b<in> Membership := Inside;
+                      Going   : @b<in> Direction := Forward)
+         @b<return> Natural;>
+@dinst
+@xcode<      @b<function> Index_Non_Blank (Source : @b<in> Bounded_String;
                                 From   : @b<in> Positive;
                                 Going  : @b<in> Direction := Forward)
          @b<return> Natural;>
@@ -872,20 +931,40 @@
                    From    : @b<in> Positive;
                    Going   : @b<in> Direction := Forward;
                    Mapping : @b<in> Maps.Character_Mapping_Function)
-      @b<return> Natural;
+      @b<return> Natural;>
 
-   @b<function> Index (Source  : @b<in> Unbounded_String;
+!corrigendum A.4.5(40)
+
+@dinsa
+@xcode<   @b<function> Index (Source  : @b<in> Unbounded_String;
+                   Pattern : @b<in> String;
+                   Going   : @b<in> Direction := Forward;
+                   Mapping : @b<in> Maps.Character_Mapping_Function)
+      @b<return> Natural;>
+@dinst
+@xcode<   @b<function> Index (Source  : @b<in> Unbounded_String;
                    Set     : @b<in> Maps.Character_Set;
                    From    : @b<in> Positive;
                    Test    : @b<in> Membership := Inside;
                    Going    : @b<in> Direction := Forward)
-      @b<return> Natural;
+      @b<return> Natural;>
+
+!corrigendum A.4.5(41)
 
-   @b<function> Index_Non_Blank (Source : @b<in> Unbounded_String;
+@dinsa
+@xcode<   @b<function> Index (Source  : @b<in> Unbounded_String;
+                   Set     : @b<in> Maps.Character_Set;
+                   Test    : @b<in> Membership := Inside;
+                   Going    : @b<in> Direction := Forward)
+      @b<return> Natural;>
+@dinst
+@xcode<   @b<function> Index_Non_Blank (Source : @b<in> Unbounded_String;
                              From   : @b<in> Positive;
                              Going  : @b<in> Direction := Forward)
       @b<return> Natural;>
 
+
+
 !corrigendum A.4.5(79)
 
 @dinsa
@@ -1043,6 +1122,20 @@
 
 @xindent<Equivalent to Item := Get_Line;>
 
+!corrigendum A.11(2)
+
+@drepl
+The specification of package Wide_Text_IO is the same as that for Text_IO,
+except that in each Get, Look_Ahead, Get_Immediate, Get_Line, Put, and Put_Line
+procedure, any occurrence of Character is replaced by Wide_Character, and any
+occurrence of String is replaced by Wide_String.
+@dby
+The specification of package Wide_Text_IO is the same as that for Text_IO,
+except that in each Get, Look_Ahead, Get_Immediate, Get_Line, Put, and Put_Line
+subprogram, any occurrence of Character is replaced by Wide_Character, and any
+occurrence of String is replaced by Wide_String.
+
+
 !corrigendum A.11(3)
 
 @dinsa
@@ -1416,7 +1509,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---    $Revision: 1.19 $                              --
+--                            $Revision: 1.20 $                              --
 --                                                                          --
 --          Copyright (C) 1992-1998, Free Software Foundation, Inc.         --
 --                                                                          --

Questions? Ask the ACAA Technical Agent