[multiple changes]

2011-12-12  Robert Dewar  <dewar@adacore.com>

	* par_sco.adb, scos.ads, put_scos.adb, get_scos.adb: Minor reformatting.

2011-12-12  Steve Baird  <baird@adacore.com>

	* sem_ch3.adb (Check_Completion): Improve a comment.

2011-12-12  Tristan Gingold  <gingold@adacore.com>

	* cstand.adb: Minor comment fix.

From-SVN: r182224

7 files changed, 31 insertions, 15 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 6adbc2a..167b3f3 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,15 @@
+2011-12-12  Robert Dewar  <dewar@adacore.com>
+
+	* par_sco.adb, scos.ads, put_scos.adb, get_scos.adb: Minor reformatting.
+
+2011-12-12  Steve Baird  <baird@adacore.com>
+
+	* sem_ch3.adb (Check_Completion): Improve a comment.
+
+2011-12-12  Tristan Gingold  <gingold@adacore.com>
+
+	* cstand.adb: Minor comment fix.
+
 2011-12-11  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gcc-interface/utils2.c (gnat_build_constructor): Test the TREE_STATIC
diff --git a/gcc/ada/cstand.adb b/gcc/ada/cstand.adb
index ce46e0f..c77afd2 100644
--- a/gcc/ada/cstand.adb
+++ b/gcc/ada/cstand.adb
@@ -1369,7 +1369,7 @@ package body CStand is
 
       begin
          --  In 32 bit mode, the size is 32 bits, and the delta and
-         --  small values are set to 20 milliseconds (20.0**(10.0**(-3)).
+         --  small values are set to 20 milliseconds (20.0*(10.0**(-3)).
 
          if Duration_32_Bits_On_Target then
             Dlo := Intval (Type_Low_Bound (Standard_Integer_32));
@@ -1377,7 +1377,7 @@ package body CStand is
             Delta_Val := UR_From_Components (UI_From_Int (20), Uint_3, 10);
 
          --  In standard 64-bit mode, the size is 64-bits and the delta and
-         --  small values are set to nanoseconds (1.0**(10.0**(-9))
+         --  small values are set to nanoseconds (1.0*(10.0**(-9))
 
          else
             Dlo := Intval (Type_Low_Bound (Standard_Integer_64));
diff --git a/gcc/ada/get_scos.adb b/gcc/ada/get_scos.adb
index 47af1b2..e096c23 100644
--- a/gcc/ada/get_scos.adb
+++ b/gcc/ada/get_scos.adb
@@ -287,13 +287,14 @@ begin
 
                   case Typ is
                      when '>' =>
-                        --  A dominance marker may be present only at an entry
-                        --  point.
+
+                        --  Dominance marker may be present only at entry point
 
                         pragma Assert (Key = 'S');
 
+                        Skipc;
                         Key := '>';
-                        Typ := Nextc;
+                        Typ := Getc;
 
                      when '1' .. '9' =>
                         Typ := ' ';
@@ -308,6 +309,7 @@ begin
                                  exit when Nextc = ':';
                                  N := N + 1;
                               end loop;
+
                               Skipc;
 
                               begin
diff --git a/gcc/ada/par_sco.adb b/gcc/ada/par_sco.adb
index 4f3a36e..a8b40b7 100644
--- a/gcc/ada/par_sco.adb
+++ b/gcc/ada/par_sco.adb
@@ -1465,8 +1465,9 @@ package body Par_SCO is
 
                when N_Loop_Statement =>
                   declare
-                     ISC : constant Node_Id := Iteration_Scheme (N);
-                     Inner_Dominant : Dominant_Info := No_Dominant;
+                     ISC            : constant Node_Id := Iteration_Scheme (N);
+                     Inner_Dominant : Dominant_Info    := No_Dominant;
+
                   begin
                      if Present (ISC) then
 
@@ -1474,7 +1475,7 @@ package body Par_SCO is
                         --  statement sequence to include the iteration scheme
                         --  and process any decisions it contains.
 
-                        --  While statement
+                        --  While loop
 
                         if Present (Condition (ISC)) then
                            Extend_Statement_Sequence (N, ISC, 'W');
@@ -1484,7 +1485,7 @@ package body Par_SCO is
 
                            Inner_Dominant := ('T', N);
 
-                        --  For statement
+                        --  For loop
 
                         else
                            Extend_Statement_Sequence (N, ISC, 'F');
diff --git a/gcc/ada/put_scos.adb b/gcc/ada/put_scos.adb
index ec25981..84d4ef6 100644
--- a/gcc/ada/put_scos.adb
+++ b/gcc/ada/put_scos.adb
@@ -169,15 +169,15 @@ begin
                               Write_Info_Char (Sent.C2);
 
                               if Sent.C1 = 'S'
-                                   and then Sent.C2 = 'P'
-                                   and then Sent.Pragma_Name /= Unknown_Pragma
+                                and then Sent.C2 = 'P'
+                                and then Sent.Pragma_Name /= Unknown_Pragma
                               then
+                                 --  Strip leading "PRAGMA_"
+
                                  declare
                                     Pnam : constant String :=
                                              Sent.Pragma_Name'Img;
                                  begin
-                                    --  Strip leading "PRAGMA_"
-
                                     Output_String
                                       (Pnam (Pnam'First + 7 .. Pnam'Last));
                                     Write_Info_Char (':');
diff --git a/gcc/ada/scos.ads b/gcc/ada/scos.ads
index 1f13e62..af4ebca 100644
--- a/gcc/ada/scos.ads
+++ b/gcc/ada/scos.ads
@@ -424,7 +424,7 @@ package SCOs is
    --             handler first sloc ('E')
    --      To   = No_Source_Location ('F'/'T'/'S'), handler last sloc ('E')
 
-   --    Note: A dominance marker is always followed by a statement entry.
+   --    Note: A dominance marker is always followed by a statement entry
 
    --    Decision (EXIT/entry guard/IF/WHILE)
    --      C1   = 'E'/'G'/'I'/'W' (for EXIT/entry Guard/IF/WHILE)
diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
index d94b94a..6c5a055 100644
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -9584,7 +9584,8 @@ package body Sem_Ch3 is
                May_Need_Implicit_Body (E);
             end if;
 
-         --  Comment needed here for Is_Generic_Type test ???
+         --  A formal incomplete type (Ada 2012) does not require a completion;
+         --  other incomplete type declarations do.
 
          elsif Ekind (E) = E_Incomplete_Type
            and then No (Underlying_Type (E))