[multiple changes]

2012-10-29  Robert Dewar  <dewar@adacore.com>

	* s-tpoben.ads, s-taskin.ads, exp_ch3.adb: Minor reformatting.

2012-10-29  Yannick Moy  <moy@adacore.com>

	* sem_prag.adb, gnat1drv.adb, opt.ads: Rename S14_Extensions
	into Formal_Extensions.

2012-10-29  Thomas Quinot  <quinot@adacore.com>

	* sem_attr.adb: Minor reformatting.

From-SVN: r192934

8 files changed, 32 insertions, 25 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index f83800c..8546a34 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,16 @@
+2012-10-29  Robert Dewar  <dewar@adacore.com>
+
+	* s-tpoben.ads, s-taskin.ads, exp_ch3.adb: Minor reformatting.
+
+2012-10-29  Yannick Moy  <moy@adacore.com>
+
+	* sem_prag.adb, gnat1drv.adb, opt.ads: Rename S14_Extensions
+	into Formal_Extensions.
+
+2012-10-29  Thomas Quinot  <quinot@adacore.com>
+
+	* sem_attr.adb: Minor reformatting.
+
 2012-10-29  Tristan Gingold  <gingold@adacore.com>
 
 	* gnat_rm.texi: Document implementation advice for Pragma
diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb
index fdf3185..f7081a6 100644
--- a/gcc/ada/exp_ch3.adb
+++ b/gcc/ada/exp_ch3.adb
@@ -3101,8 +3101,7 @@ package body Exp_Ch3 is
 
                      Clean_Task_Names (Typ, Proc_Id);
 
-                     --  Preserve the initialization state in the current
-                     --  counter.
+                     --  Preserve initialization state in the current counter
 
                      if Needs_Finalization (Typ) then
                         if No (Counter_Id) then
diff --git a/gcc/ada/gnat1drv.adb b/gcc/ada/gnat1drv.adb
index 39d008e..47c4b17 100644
--- a/gcc/ada/gnat1drv.adb
+++ b/gcc/ada/gnat1drv.adb
@@ -419,7 +419,7 @@ procedure Gnat1drv is
       --  Set switches for formal verification mode
 
       if Debug_Flag_Dot_VV then
-         S14_Extensions := True;
+         Formal_Extensions := True;
       end if;
 
       if Debug_Flag_Dot_FF then
diff --git a/gcc/ada/opt.ads b/gcc/ada/opt.ads
index b832c1f..9221be9 100644
--- a/gcc/ada/opt.ads
+++ b/gcc/ada/opt.ads
@@ -1936,7 +1936,7 @@ package Opt is
    --  for integers are limited to the strict minimum with this option. Set by
    --  debug flag -gnatd.D.
 
-   S14_Extensions : Boolean := False;
+   Formal_Extensions : Boolean := False;
    --  When this flag is set, new aspects/pragmas/attributes are accepted,
    --  whose main purpose is to facilitate formal verification. Set by debug
    --  flag -gnatd.V.
diff --git a/gcc/ada/s-taskin.ads b/gcc/ada/s-taskin.ads
index 9584901..03533a8 100644
--- a/gcc/ada/s-taskin.ads
+++ b/gcc/ada/s-taskin.ads
@@ -1209,7 +1209,6 @@ private
    procedure Set_Entry_Names
      (Self_Id : Task_Id;
       Names   : Task_Entry_Names_Access);
-   --  Associate an array of string that denote entry [family] names with a
-   --  task.
+   --  Associate an array of strings denotinge entry [family] names with a task
 
 end System.Tasking;
diff --git a/gcc/ada/s-tpoben.ads b/gcc/ada/s-tpoben.ads
index acdf69f..b41f1ca 100644
--- a/gcc/ada/s-tpoben.ads
+++ b/gcc/ada/s-tpoben.ads
@@ -59,34 +59,30 @@ package System.Tasking.Protected_Objects.Entries is
 
    type Protected_Entry_Body_Array is
      array (Positive_Protected_Entry_Index range <>) of Entry_Body;
-   --  This is an array of the executable code for all entry bodies of
-   --  a protected type.
+   --  Contains executable code for all entry bodies of a protected type
 
    type Protected_Entry_Body_Access is access all Protected_Entry_Body_Array;
 
    type Protected_Entry_Queue_Array is
      array (Protected_Entry_Index range <>) of Entry_Queue;
 
-   --  A data structure which contains the string names of entries and entry
-   --  family members.
-
    type Protected_Entry_Names_Array is
      array (Protected_Entry_Index range <>) of String_Access;
-
    type Protected_Entry_Names_Access is access all Protected_Entry_Names_Array;
+   --  Contains string name of entries and entry family members
 
-   --  This type contains the GNARL state of a protected object. The
-   --  application-defined portion of the state (i.e. private objects)
-   --  is maintained by the compiler-generated code.
-   --  note that there is a simplified version of this type declared in
-   --  System.Tasking.PO_Simple that handle the simple case (no entries).
+   --  The following type contains the GNARL state of a protected object.
+   --  The application-defined portion of the state (i.e. private objects)
+   --  is maintained by the compiler-generated code. Note that there is a
+   --  simplified version of this type declared in System.Tasking.PO_Simple
+   --  that handle the simple case (no entries).
 
    type Protection_Entries (Num_Entries : Protected_Entry_Index) is new
      Ada.Finalization.Limited_Controlled
    with record
-      L                 : aliased Task_Primitives.Lock;
-      --  The underlying lock associated with a Protection_Entries.
-      --  Note that you should never (un)lock Object.L directly, but instead
+      L : aliased Task_Primitives.Lock;
+      --  The underlying lock associated with a Protection_Entries. Note
+      --  that you should never (un)lock Object.L directly, but instead
       --  use Lock_Entries/Unlock_Entries.
 
       Compiler_Info : System.Address;
@@ -150,8 +146,8 @@ package System.Tasking.Protected_Objects.Entries is
       --  Entries components.
    end record;
 
-   --  No default initial values for this type, since call records
-   --  will need to be re-initialized before every use.
+   --  No default initial values for this type, since call records will need to
+   --  be re-initialized before every use.
 
    type Protection_Entries_Access is access all Protection_Entries'Class;
    --  See comments in s-tassta.adb about the implicit call to Current_Master
diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb
index 5b1585a..4118087 100644
--- a/gcc/ada/sem_attr.adb
+++ b/gcc/ada/sem_attr.adb
@@ -646,8 +646,8 @@ package body Sem_Attr is
                Kill_Current_Values;
             end if;
 
-            --  Treat as call for elaboration purposes and we are all
-            --  done. Suppress this treatment under debug flag.
+            --  Treat as call for elaboration purposes and we are all done.
+            --  Suppress this treatment under debug flag.
 
             if not Debug_Flag_Dot_UU then
                Check_Elab_Call (N);
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 7f098ab..aee77f9 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -6430,7 +6430,7 @@ package body Sem_Prag is
 
       procedure S14_Pragma is
       begin
-         if not S14_Extensions then
+         if not Formal_Extensions then
             Error_Pragma ("pragma% requires the use of debug switch -gnatd.V");
          end if;
       end S14_Pragma;