[multiple changes]

2009-04-09  Vincent Celier  <celier@adacore.com>

	* errout.adb: Remove dependency on package Style

	* style.ads, styleg.adb, styleg.ads (RM_Column_Check): Remove function,
	moved to Stylesw.
	
	* stylesw.ads, stylesw.adb (RM_Column_Check): New function, moved from
	Styleg.

	* errutil.adb, par.adb: Import Stylesw

2009-04-09  Arnaud Charlet  <charlet@adacore.com>

	* opt.ads: Fix typos.

2009-04-09  Robert Dewar  <dewar@adacore.com>

	* einfo.adb: Minor reformatting

From-SVN: r145832

15 files changed, 51 insertions, 39 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 61cdc11..9c0f4289 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,23 @@
+2009-04-09  Vincent Celier  <celier@adacore.com>
+
+	* errout.adb: Remove dependency on package Style
+
+	* style.ads, styleg.adb, styleg.ads (RM_Column_Check): Remove function,
+	moved to Stylesw.
+	
+	* stylesw.ads, stylesw.adb (RM_Column_Check): New function, moved from
+	Styleg.
+
+	* errutil.adb, par.adb: Import Stylesw
+
+2009-04-09  Arnaud Charlet  <charlet@adacore.com>
+
+	* opt.ads: Fix typos.
+
+2009-04-09  Robert Dewar  <dewar@adacore.com>
+
+	* einfo.adb: Minor reformatting
+
 2009-04-09  Robert Dewar  <dewar@adacore.com>
 
 	* gcc-interface/Make-lang.in, style.ads, style.adb: Reorganize style
diff --git a/gcc/ada/einfo.adb b/gcc/ada/einfo.adb
index d4dad33..468f255 100644
--- a/gcc/ada/einfo.adb
+++ b/gcc/ada/einfo.adb
@@ -52,11 +52,11 @@ package body Einfo is
    ----------------------------------------------
 
    --  Four of these fields are defined in Sinfo, since they in are the
-   --  base part of the node. The access routines for these fields and
-   --  the corresponding set procedures are defined in Sinfo. These fields
-   --  are present in all entities. Note that Homonym is also in the base
-   --  part of the node, but has access routines that are more properly
-   --  part of Einfo, which is why they are defined here.
+   --  base part of the node. The access routines for these fields and the
+   --  corresponding set procedures are defined in Sinfo. These fields are
+   --  present in all entities. Note that Homonym is also in the base part of
+   --  the node, but has access routines that are more properly part of Einfo,
+   --  which is why they are defined here.
 
    --    Chars                           Name1
    --    Next_Entity                     Node2
diff --git a/gcc/ada/errout.adb b/gcc/ada/errout.adb
index 0424880..68d6409 100644
--- a/gcc/ada/errout.adb
+++ b/gcc/ada/errout.adb
@@ -47,7 +47,7 @@ with Sinput;   use Sinput;
 with Sinfo;    use Sinfo;
 with Snames;   use Snames;
 with Stand;    use Stand;
-with Style;
+with Stylesw;  use Stylesw;
 with Uname;    use Uname;
 
 package body Errout is
@@ -2138,7 +2138,7 @@ package body Errout is
 
    procedure Set_Msg_Insertion_Column is
    begin
-      if Style.RM_Column_Check then
+      if RM_Column_Check then
          Set_Msg_Str (" in column ");
          Set_Msg_Int (Int (Error_Msg_Col) + 1);
       end if;
diff --git a/gcc/ada/errutil.adb b/gcc/ada/errutil.adb
index 480a355..28c0140 100644
--- a/gcc/ada/errutil.adb
+++ b/gcc/ada/errutil.adb
@@ -30,6 +30,7 @@ with Opt;      use Opt;
 with Output;   use Output;
 with Scans;    use Scans;
 with Sinput;   use Sinput;
+with Stylesw;  use Stylesw;
 
 package body Errutil is
 
@@ -658,7 +659,7 @@ package body Errutil is
 
    procedure Set_Msg_Insertion_Column is
    begin
-      if Style.RM_Column_Check then
+      if RM_Column_Check then
          Set_Msg_Str (" in column ");
          Set_Msg_Int (Int (Error_Msg_Col) + 1);
       end if;
diff --git a/gcc/ada/opt.ads b/gcc/ada/opt.ads
index 3093d37..6cc14d0 100644
--- a/gcc/ada/opt.ads
+++ b/gcc/ada/opt.ads
@@ -1430,8 +1430,8 @@ package Opt is
 
    Assume_No_Invalid_Values_Config : Boolean;
    --  GNAT
-   --  This is the value of the configuration switch for assuming no invalid
-   --  values enabled mode mode, as possibly set by the command line switch
+   --  This is the value of the configuration switch for assuming "no invalid
+   --  values enabled" mode, as possibly set by the command line switch
    --  -gnatB, and possibly modified by the use of the configuration pragma
    --  Assume_No_Invalid_Values.
 
diff --git a/gcc/ada/par-ch5.adb b/gcc/ada/par-ch5.adb
index 57c5444..e0a7e0a 100644
--- a/gcc/ada/par-ch5.adb
+++ b/gcc/ada/par-ch5.adb
@@ -1104,7 +1104,7 @@ package body Ch5 is
 
       procedure Check_If_Column is
       begin
-         if Style.RM_Column_Check and then Token_Is_At_Start_Of_Line
+         if RM_Column_Check and then Token_Is_At_Start_Of_Line
            and then Start_Column /= Scope.Table (Scope.Last).Ecol
          then
             Error_Msg_Col := Scope.Table (Scope.Last).Ecol;
@@ -2076,7 +2076,7 @@ package body Ch5 is
 
             Error_Msg_Col := Scope.Table (Scope.Last).Ecol;
 
-            if Style.RM_Column_Check
+            if RM_Column_Check
               and then Token_Is_At_Start_Of_Line
               and then Start_Column /= Error_Msg_Col
             then
diff --git a/gcc/ada/par-ch7.adb b/gcc/ada/par-ch7.adb
index 2fdca9a..3b24c87 100644
--- a/gcc/ada/par-ch7.adb
+++ b/gcc/ada/par-ch7.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2007, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2008, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -200,7 +200,7 @@ package body Ch7 is
                if Token = Tok_Private then
                   Error_Msg_Col := Scope.Table (Scope.Last).Ecol;
 
-                  if Style.RM_Column_Check then
+                  if RM_Column_Check then
                      if Token_Is_At_Start_Of_Line
                        and then Start_Column /= Error_Msg_Col
                      then
diff --git a/gcc/ada/par-endh.adb b/gcc/ada/par-endh.adb
index 89310ad..e04b154 100644
--- a/gcc/ada/par-endh.adb
+++ b/gcc/ada/par-endh.adb
@@ -1029,7 +1029,7 @@ package body Endh is
             --  Right in this context means exactly right, or on the same
             --  line as the opener.
 
-            if Style.RM_Column_Check then
+            if RM_Column_Check then
                if End_Column /= Scope.Table (Scope.Last).Ecol
                  and then Current_Line_Start > Scope.Table (Scope.Last).Sloc
 
diff --git a/gcc/ada/par-util.adb b/gcc/ada/par-util.adb
index bf9d7df..bf5680e 100644
--- a/gcc/ada/par-util.adb
+++ b/gcc/ada/par-util.adb
@@ -158,7 +158,7 @@ package body Util is
 
    procedure Check_Bad_Layout is
    begin
-      if Style.RM_Column_Check and then Token_Is_At_Start_Of_Line
+      if RM_Column_Check and then Token_Is_At_Start_Of_Line
         and then Start_Column <= Scope.Table (Scope.Last).Ecol
       then
          Error_Msg_BC ("(style) incorrect layout");
diff --git a/gcc/ada/par.adb b/gcc/ada/par.adb
index 2f9edeb..6a047db 100644
--- a/gcc/ada/par.adb
+++ b/gcc/ada/par.adb
@@ -42,6 +42,7 @@ with Sinput.L; use Sinput.L;
 with Sinfo;    use Sinfo;
 with Snames;   use Snames;
 with Style;
+with Stylesw;  use Stylesw;
 with Table;
 with Tbuild;   use Tbuild;
 
diff --git a/gcc/ada/style.ads b/gcc/ada/style.ads
index 7afc818..4e84a48 100644
--- a/gcc/ada/style.ads
+++ b/gcc/ada/style.ads
@@ -210,10 +210,4 @@ package Style is
    --  lower case letters. On entry Token_Ptr points to the keyword token.
    --  This is not used for keywords appearing as attribute designators,
    --  where instead Check_Attribute_Name (True) is called.
-
-   function RM_Column_Check return Boolean
-     renames Style_Inst.RM_Column_Check;
-   --  Determines whether style checking is active and the RM column check
-   --  mode is set requiring checking of RM format layout.
-
 end Style;
diff --git a/gcc/ada/styleg.adb b/gcc/ada/styleg.adb
index 2bb6b35..d3ce9e1 100644
--- a/gcc/ada/styleg.adb
+++ b/gcc/ada/styleg.adb
@@ -1006,13 +1006,4 @@ package body Styleg is
       end if;
    end Require_Preceding_Space;
 
-   ---------------------
-   -- RM_Column_Check --
-   ---------------------
-
-   function RM_Column_Check return Boolean is
-   begin
-      return Style_Check and Style_Check_Layout;
-   end RM_Column_Check;
-
 end Styleg;
diff --git a/gcc/ada/styleg.ads b/gcc/ada/styleg.ads
index ac883b6..64fd51e 100644
--- a/gcc/ada/styleg.ads
+++ b/gcc/ada/styleg.ads
@@ -29,9 +29,6 @@
 --  to these subprograms are only made if Opt.Style_Check is set True.
 --  Styleg does not depends on the GNAT tree (Atree, Sinfo, ...).
 
---  For the compiler, there is also a child package Styleg.C that depends
---  on the GNAT tree.
-
 with Types; use Types;
 
 generic
@@ -173,9 +170,4 @@ package Styleg is
    --  This is not used for keywords appearing as attribute designators,
    --  where instead Check_Attribute_Name (True) is called.
 
-   function RM_Column_Check return Boolean;
-   pragma Inline (RM_Column_Check);
-   --  Determines whether style checking is active and the RM column check
-   --  mode is set requiring checking of RM format layout.
-
 end Styleg;
diff --git a/gcc/ada/stylesw.adb b/gcc/ada/stylesw.adb
index 764d9af..8adb741 100644
--- a/gcc/ada/stylesw.adb
+++ b/gcc/ada/stylesw.adb
@@ -61,6 +61,15 @@ package body Stylesw is
       Style_Check_Xtra_Parens           := False;
    end Reset_Style_Check_Options;
 
+   ---------------------
+   -- RM_Column_Check --
+   ---------------------
+
+   function RM_Column_Check return Boolean is
+   begin
+      return Style_Check and Style_Check_Layout;
+   end RM_Column_Check;
+
    ------------------------------
    -- Save_Style_Check_Options --
    ------------------------------
diff --git a/gcc/ada/stylesw.ads b/gcc/ada/stylesw.ads
index 4ee7074..5822ce9 100644
--- a/gcc/ada/stylesw.ads
+++ b/gcc/ada/stylesw.ads
@@ -272,6 +272,10 @@ package Stylesw is
    -- Subprograms --
    -----------------
 
+   function RM_Column_Check return Boolean;
+   --  Determines whether style checking is active and the RM column check
+   --  mode is set requiring checking of RM format layout.
+
    procedure Set_Default_Style_Check_Options;
    --  This procedure is called to set the default style checking options in
    --  response to a -gnaty switch with no suboptions or from -gnatyy.