CVS difference for ai12s/ai12-0384-2.txt

--- ai12s/ai12-0384-2.txt	2020/10/22 23:58:59	1.2
+++ ai12s/ai12-0384-2.txt	2021/02/06 05:48:49	1.3
@@ -1,4 +1,5 @@
-!standard 4.10(0)                                20-10-21  AI12-0384-2/02
+!standard 4.10(0)                                21-02-01  AI12-0384-2/03
+!standard A.4.12(0)
 !class Amendment 20-10-14
 !status Amendment 1-2012 20-10-21
 !status ARG Approved 9-0-5  20-10-21
@@ -221,17 +222,17 @@
 
      Standard_Indent : constant Text_Buffer_Count := 3;
    
-     function Current_Indent
-       (Buffer : Root_Buffer_Type) return Text_Buffer_Count;
+     function Current_Indent (
+        Buffer : Root_Buffer_Type) return Text_Buffer_Count;
    
-     procedure Increase_Indent
-       (Buffer : in out Root_Buffer_Type;
+     procedure Increase_Indent (
+        Buffer : in out Root_Buffer_Type;
         Amount : in     Text_Buffer_Count := Standard_Indent)
         with Post'Class =>
           Current_Indent (Buffer) = Current_Indent (Buffer)'Old + Amount;
       
-     procedure Decrease_Indent
-       (Buffer : in out Root_Buffer_Type;
+     procedure Decrease_Indent (
+        Buffer : in out Root_Buffer_Type;
         Amount : in     Text_Buffer_Count := Standard_Indent)
         with Pre'Class =>
                 Current_Indent (Buffer) >= Amount
@@ -250,21 +251,21 @@
      type Buffer_Type is new Root_Buffer_Type with private;
  
      function Get (
-        Buffer     : in out Buffer_Type)
+        Buffer : in out Buffer_Type)
         return String
         with Post'Class => 
           Get'Result'First = 1
             and then Current_Indent (Buffer) = 0;
       
      function Wide_Get (
-        Buffer     : in out Buffer_Type)
+        Buffer : in out Buffer_Type)
         return Wide_String
         with Post'Class =>
           Wide_Get'Result'First = 1
             and then Current_Indent (Buffer) = 0;
  
      function Wide_Wide_Get (
-        Buffer     : in out Buffer_Type)
+        Buffer : in out Buffer_Type)
         return Wide_Wide_String
         with Post'Class =>
           Wide_Wide_Get'Result'First = 1 
@@ -285,9 +286,8 @@
             and then Current_Indent (Buffer) = 0;
 
   private 
-     ... -- not specified by the language,
-     ... -- but will include nonabstract overridings of all
-     ... -- inherited subprograms that require overriding.
+     ... -- not specified by the language, but will include nonabstract
+         -- overridings of all inherited subprograms that require overriding.
   end Ada.Strings.Text_Buffers.Unbounded;
   
   package Ada.Strings.Text_Buffers.Bounded
@@ -304,9 +304,8 @@
      --  are declared here just as in the Unbounded child.
      
   private
-     ... -- not specified by the language,
-     ... -- but will include nonabstract overridings of all
-     ... -- inherited subprograms that require overriding.
+     ... -- not specified by the language, but will include nonabstract
+         -- overridings of all inherited subprograms that require overriding.
   end Ada.Strings.Text_Buffers.Bounded;   
 
 Modify A.4.12 (27/5):
@@ -340,7 +339,7 @@
   {As part of a call on any of the Get functions, the buffer is reset to
   an empty state, with no stored characters.}
   
-Add after A.4.12
+Add after A.4.12 (29/5):
 
   In the case of a Buf of type Text_Buffers.Bounded.Buffer_Type,
   Text_Truncated (Buf) returns True if the various Put procedures
@@ -421,6 +420,19 @@
 actually OK because presumably Length is a discriminant and Data has a
 per-object constraint, meaning that the expression defining Data isn't
 evaluated until after Character_Count returns (see RM 4.3.1(19/5)).
+
+!corrigendum 4.10(0)
+
+@dinsc
+
+** Force a conflict; the actual changes are in the conflict file. **
+
+!corrigendum A.4.12(0)
+
+@dinsc
+
+** Force a conflict; the actual changes are in the conflict file. **
+
 
 !ASIS