Commit c4e1d59d by Robert Dewar Committed by Arnaud Charlet

sem_prag.adb, [...]: Minor reformatting.

2013-02-06  Robert Dewar  <dewar@adacore.com>

	* sem_prag.adb, sem_ch6.adb, prj-conf.adb, erroutc.adb: Minor
	reformatting.

From-SVN: r195787
parent 1aee1fb3
2013-02-06 Robert Dewar <dewar@adacore.com>
* sem_prag.adb, sem_ch6.adb, prj-conf.adb, erroutc.adb: Minor
reformatting.
2013-02-06 Gary Dismukes <dismukes@adacore.com> 2013-02-06 Gary Dismukes <dismukes@adacore.com>
* sem_ch6.adb (Check_For_Primitive_Subprogram): Test for * sem_ch6.adb (Check_For_Primitive_Subprogram): Test for
......
...@@ -1276,19 +1276,26 @@ package body Erroutc is ...@@ -1276,19 +1276,26 @@ package body Erroutc is
for J in Specific_Warnings.First .. Specific_Warnings.Last loop for J in Specific_Warnings.First .. Specific_Warnings.Last loop
declare declare
SWE : Specific_Warning_Entry renames Specific_Warnings.Table (J); SWE : Specific_Warning_Entry renames Specific_Warnings.Table (J);
begin begin
if not SWE.Config then if not SWE.Config then
-- Warn for unmatched Warnings (Off, ...)
if SWE.Open then if SWE.Open then
Eproc.all Eproc.all
("?pragma Warnings Off with no matching Warnings On", ("?pragma Warnings Off with no matching Warnings On",
SWE.Start); SWE.Start);
-- Warn for ineffective Warnings (Off, ..)
elsif not SWE.Used
-- Do not issue this warning for -Wxxx messages since the -- Do not issue this warning for -Wxxx messages since the
-- back-end doesn't report the information. -- back-end doesn't report the information.
elsif not SWE.Used and then not
and then not (SWE.Msg'Length > 2 (SWE.Msg'Length > 2 and then SWE.Msg (1 .. 2) = "-W")
and then SWE.Msg (1 .. 2) = "-W")
then then
Eproc.all Eproc.all
("?no warning suppressed by this pragma", SWE.Start); ("?no warning suppressed by this pragma", SWE.Start);
......
...@@ -567,8 +567,7 @@ package body Prj.Conf is ...@@ -567,8 +567,7 @@ package body Prj.Conf is
OK := OK :=
Target = "" Target = ""
or else or else (Tgt_Name /= No_Name
(Tgt_Name /= No_Name
and then Target = Get_Name_String (Tgt_Name)); and then Target = Get_Name_String (Tgt_Name));
if not OK then if not OK then
...@@ -778,6 +777,7 @@ package body Prj.Conf is ...@@ -778,6 +777,7 @@ package body Prj.Conf is
procedure Get_Project_Target is procedure Get_Project_Target is
begin begin
if Selected_Target'Length = 0 then if Selected_Target'Length = 0 then
-- Check if attribute Target is specified in the main -- Check if attribute Target is specified in the main
-- project, or in a project it extends. If it is, use this -- project, or in a project it extends. If it is, use this
-- target to invoke gprconfig. -- target to invoke gprconfig.
...@@ -1021,15 +1021,16 @@ package body Prj.Conf is ...@@ -1021,15 +1021,16 @@ package body Prj.Conf is
else else
if Selected_Target'Length = 0 then if Selected_Target'Length = 0 then
if At_Least_One_Compiler_Command then if At_Least_One_Compiler_Command then
Args (4) := new String'("--target=all"); Args (4) :=
new String'("--target=all");
else else
Args (4) := Args (4) :=
new String'("--target=" & Normalized_Hostname); new String'("--target=" & Normalized_Hostname);
end if; end if;
else else
Args (4) := new String'("--target=" & Selected_Target.all); Args (4) :=
new String'("--target=" & Selected_Target.all);
end if; end if;
Arg_Last := 4; Arg_Last := 4;
......
...@@ -2909,6 +2909,9 @@ package body Sem_Ch6 is ...@@ -2909,6 +2909,9 @@ package body Sem_Ch6 is
and then Serious_Errors_Detected = 0 and then Serious_Errors_Detected = 0
and then Present (Spec_Id) and then Present (Spec_Id)
and then Has_Pragma_Inline (Spec_Id) and then Has_Pragma_Inline (Spec_Id)
-- This test needs commenting ???
and then In_Extended_Main_Code_Unit (N) and then In_Extended_Main_Code_Unit (N)
then then
Check_And_Build_Body_To_Inline (N, Spec_Id, Body_Id); Check_And_Build_Body_To_Inline (N, Spec_Id, Body_Id);
......
...@@ -16026,9 +16026,7 @@ package body Sem_Prag is ...@@ -16026,9 +16026,7 @@ package body Sem_Prag is
J := J + 1; J := J + 1;
C := Get_String_Char (Str, J); C := Get_String_Char (Str, J);
Chr := Get_Character (C); Chr := Get_Character (C);
if Chr = 'W' then exit when Chr = 'W';
exit;
end if;
OK := False; OK := False;
-- Dot case -- Dot case
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment