+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
----------------------------------------------
-- 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
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
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;
with Output; use Output;
with Scans; use Scans;
with Sinput; use Sinput;
+with Stylesw; use Stylesw;
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;
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.
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;
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
-- --
-- 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- --
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
-- 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
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");
with Sinfo; use Sinfo;
with Snames; use Snames;
with Style;
+with Stylesw; use Stylesw;
with Table;
with Tbuild; use Tbuild;
-- 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;
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;
-- 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
-- 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;
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 --
------------------------------
-- 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.
projects / thirdparty / gcc.git / commitdiff
