[Ada] Minor reformatting
2018-01-11 Hristian Kirtchev <kirtchev@adacore.com> gcc/ada/ * binde.adb, par-ch6.adb, par-ch9.adb, sem_ch12.adb, sem_ch13.adb: Minor reformatting. From-SVN: r256518
This commit is contained in:
parent
cb48811816
commit
27d357ca80
|
@ -1,3 +1,8 @@
|
|||
2018-01-11 Hristian Kirtchev <kirtchev@adacore.com>
|
||||
|
||||
* binde.adb, par-ch6.adb, par-ch9.adb, sem_ch12.adb, sem_ch13.adb:
|
||||
Minor reformatting.
|
||||
|
||||
2018-01-11 Justin Squirek <squirek@adacore.com>
|
||||
|
||||
* par-ch6.adb (Scan_Body_Or_Expression_Function): Add additional check
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
-- --
|
||||
-- B o d y --
|
||||
-- --
|
||||
-- Copyright (C) 1992-2017, Free Software Foundation, Inc. --
|
||||
-- Copyright (C) 1992-2018, 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- --
|
||||
|
@ -1808,11 +1808,11 @@ package body Binde is
|
|||
|
||||
package Name_Map is new System.HTable.Simple_HTable
|
||||
(Header_Num => Header_Num,
|
||||
Element => Line_Number,
|
||||
Element => Line_Number,
|
||||
No_Element => No_Line_Number,
|
||||
Key => Unit_Name_Type,
|
||||
Hash => Hash,
|
||||
Equal => "=");
|
||||
Key => Unit_Name_Type,
|
||||
Hash => Hash,
|
||||
Equal => "=");
|
||||
-- Name_Map contains an entry for each file name seen, mapped to the
|
||||
-- line number where we saw it first. This is used to give an error for
|
||||
-- duplicates.
|
||||
|
@ -1979,6 +1979,7 @@ package body Binde is
|
|||
declare
|
||||
Uname : constant Unit_Name_Type := Name_Find (Get_Line);
|
||||
Error : Boolean := False;
|
||||
|
||||
begin
|
||||
if Uname = Empty_Name then
|
||||
null; -- silently skip blank lines
|
||||
|
@ -1996,7 +1997,7 @@ package body Binde is
|
|||
|
||||
if Get_Name_Table_Int (Uname) = 0
|
||||
or else Unit_Id (Get_Name_Table_Int (Uname)) =
|
||||
No_Unit_Id
|
||||
No_Unit_Id
|
||||
then
|
||||
Error := True;
|
||||
if Doing_New then
|
||||
|
@ -2012,8 +2013,9 @@ package body Binde is
|
|||
Error_Msg_Nat_1 := Nat (Cur_Line_Number);
|
||||
Error_Msg_Unit_1 := Uname;
|
||||
Error_Msg_Nat_2 := Nat (Dup);
|
||||
Error_Msg (Force_Elab_Order_File.all &
|
||||
":#: duplicate unit name $ from line #");
|
||||
Error_Msg
|
||||
(Force_Elab_Order_File.all
|
||||
& ":#: duplicate unit name $ from line #");
|
||||
end if;
|
||||
end if;
|
||||
end;
|
||||
|
@ -2023,12 +2025,12 @@ package body Binde is
|
|||
Cur_Unit : constant Unit_Id := Unit_Id_Of (Uname);
|
||||
begin
|
||||
if Is_Internal_File_Name
|
||||
(Units.Table (Cur_Unit).Sfile)
|
||||
(Units.Table (Cur_Unit).Sfile)
|
||||
then
|
||||
if Doing_New then
|
||||
Write_Line
|
||||
("""" & Get_Name_String (Uname) &
|
||||
""": predefined unit ignored");
|
||||
("""" & Get_Name_String (Uname)
|
||||
& """: predefined unit ignored");
|
||||
end if;
|
||||
|
||||
else
|
||||
|
@ -2042,8 +2044,8 @@ package body Binde is
|
|||
|
||||
Build_Link
|
||||
(Before => Prev_Unit,
|
||||
After => Cur_Unit,
|
||||
R => Forced);
|
||||
After => Cur_Unit,
|
||||
R => Forced);
|
||||
end if;
|
||||
|
||||
Prev_Unit := Cur_Unit;
|
||||
|
|
|
@ -873,6 +873,7 @@ package body Ch6 is
|
|||
New_Node
|
||||
(N_Expression_Function, Sloc (Specification_Node));
|
||||
Set_Specification (Body_Node, Specification_Node);
|
||||
|
||||
declare
|
||||
Expr : constant Node_Id := P_Expression;
|
||||
begin
|
||||
|
@ -888,8 +889,9 @@ package body Ch6 is
|
|||
N_Extension_Aggregate,
|
||||
N_Quantified_Expression))
|
||||
then
|
||||
Error_Msg ("expression function must be enclosed "
|
||||
& "in parentheses", Sloc (Expr));
|
||||
Error_Msg
|
||||
("expression function must be enclosed in "
|
||||
& "parentheses", Sloc (Expr));
|
||||
end if;
|
||||
end;
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
-- --
|
||||
-- B o d y --
|
||||
-- --
|
||||
-- Copyright (C) 1992-2017, Free Software Foundation, Inc. --
|
||||
-- Copyright (C) 1992-2018, 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- --
|
||||
|
@ -787,8 +787,7 @@ package body Ch9 is
|
|||
-- Start of processing for P_Protected_Operation_Declaration_Opt
|
||||
|
||||
begin
|
||||
-- This loop runs more than once only when a junk declaration
|
||||
-- is skipped.
|
||||
-- This loop runs more than once only when a junk declaration is skipped
|
||||
|
||||
loop
|
||||
case Token is
|
||||
|
@ -796,7 +795,9 @@ package body Ch9 is
|
|||
Result := P_Pragma;
|
||||
exit;
|
||||
|
||||
when Tok_Not | Tok_Overriding =>
|
||||
when Tok_Not
|
||||
| Tok_Overriding
|
||||
=>
|
||||
Result := P_Entry_Or_Subprogram_With_Indicator;
|
||||
exit;
|
||||
|
||||
|
@ -804,7 +805,9 @@ package body Ch9 is
|
|||
Result := P_Entry_Declaration;
|
||||
exit;
|
||||
|
||||
when Tok_Function | Tok_Procedure =>
|
||||
when Tok_Function
|
||||
| Tok_Procedure
|
||||
=>
|
||||
Result := P_Subprogram (Pf_Decl_Pexp);
|
||||
exit;
|
||||
|
||||
|
@ -846,7 +849,7 @@ package body Ch9 is
|
|||
|
||||
if Nkind (Result) = N_Subprogram_Declaration
|
||||
and then Nkind (Specification (Result)) =
|
||||
N_Procedure_Specification
|
||||
N_Procedure_Specification
|
||||
and then Null_Present (Specification (Result))
|
||||
then
|
||||
Error_Msg_N
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
-- --
|
||||
-- B o d y --
|
||||
-- --
|
||||
-- Copyright (C) 1992-2017, Free Software Foundation, Inc. --
|
||||
-- Copyright (C) 1992-2018, 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- --
|
||||
|
@ -1279,9 +1279,8 @@ package body Sem_Ch12 is
|
|||
if No (Formal) then
|
||||
Error_Msg_Sloc := Sloc (Node (Elem));
|
||||
Error_Msg_NE
|
||||
("?instance uses predefined operation, "
|
||||
& "not primitive operation&#",
|
||||
Actual, Node (Elem));
|
||||
("?instance uses predefined operation, not primitive "
|
||||
& "operation&#", Actual, Node (Elem));
|
||||
end if;
|
||||
end if;
|
||||
|
||||
|
@ -1726,7 +1725,7 @@ package body Sem_Ch12 is
|
|||
|
||||
if Is_Fixed_Point_Type (Entity (Match))
|
||||
and then not Is_Private_Type
|
||||
(Defining_Identifier (Analyzed_Formal))
|
||||
(Defining_Identifier (Analyzed_Formal))
|
||||
then
|
||||
Check_Fixed_Point_Actual (Match);
|
||||
end if;
|
||||
|
|
|
@ -12690,8 +12690,8 @@ package body Sem_Ch13 is
|
|||
elsif Nkind (N) = N_Selected_Component then
|
||||
|
||||
-- If selector name is not our type, keep going (we might still
|
||||
-- have an occurrence of the type in the prefix).
|
||||
-- If it is a subcomponent of the current entity, add prefix.
|
||||
-- have an occurrence of the type in the prefix). If it is a
|
||||
-- subcomponent of the current entity, add prefix.
|
||||
|
||||
if Nkind (Selector_Name (N)) /= N_Identifier
|
||||
or else Chars (Selector_Name (N)) /= TName
|
||||
|
|
Loading…
Reference in New Issue