Commit cdabbb52 by Hristian Kirtchev Committed by Arnaud Charlet

lib-xref-spark_specific.adb, [...]: Minor reformatting.

2015-10-27  Hristian Kirtchev  <kirtchev@adacore.com>

	* lib-xref-spark_specific.adb, a-dirval-mingw.adb, exp_ch6.adb,
	sem_ch8.adb, s-os_lib.adb: Minor reformatting.

From-SVN: r229419
parent f6f40114
2015-10-27 Hristian Kirtchev <kirtchev@adacore.com>
* lib-xref-spark_specific.adb, a-dirval-mingw.adb, exp_ch6.adb,
sem_ch8.adb, s-os_lib.adb: Minor reformatting.
2015-10-27 Yannick Moy <moy@adacore.com> 2015-10-27 Yannick Moy <moy@adacore.com>
* lib-xref-spark_specific.adb * lib-xref-spark_specific.adb
......
...@@ -77,8 +77,7 @@ package body Ada.Directories.Validity is ...@@ -77,8 +77,7 @@ package body Ada.Directories.Validity is
if Name'Length >= 2 if Name'Length >= 2
and then Name (Start + 1) = ':' and then Name (Start + 1) = ':'
and then and then
(Name (Start) in 'A' .. 'Z' (Name (Start) in 'A' .. 'Z' or else Name (Start) in 'a' .. 'z')
or else Name (Start) in 'a' .. 'z')
then then
Start := Start + 2; Start := Start + 2;
......
...@@ -8332,16 +8332,16 @@ package body Exp_Ch6 is ...@@ -8332,16 +8332,16 @@ package body Exp_Ch6 is
Func_Id : constant Entity_Id := Entity (Name (N)); Func_Id : constant Entity_Id := Entity (Name (N));
Func_Decl : constant Node_Id := Unit_Declaration_Node (Func_Id); Func_Decl : constant Node_Id := Unit_Declaration_Node (Func_Id);
Par : constant Node_Id := Parent (N); Par : constant Node_Id := Parent (N);
Loc : constant Source_Ptr := Sloc (Par);
Proc_Id : constant Entity_Id := Defining_Entity (Next (Func_Decl)); Proc_Id : constant Entity_Id := Defining_Entity (Next (Func_Decl));
Loc : constant Source_Ptr := Sloc (Par);
Actuals : List_Id; Actuals : List_Id;
Last_Formal : Entity_Id; Last_Formal : Entity_Id;
begin begin
-- The actuals may be given by named associations, so the added -- The actuals may be given by named associations, so the added actual
-- actual that is the target of the return value of the call must -- that is the target of the return value of the call must be a named
-- be a named association as well, so we retrieve the name of the -- association as well, so we retrieve the name of the generated
-- generated out_formal. -- out_formal.
Last_Formal := First_Formal (Proc_Id); Last_Formal := First_Formal (Proc_Id);
while Present (Next_Formal (Last_Formal)) loop while Present (Next_Formal (Last_Formal)) loop
...@@ -8366,8 +8366,10 @@ package body Exp_Ch6 is ...@@ -8366,8 +8366,10 @@ package body Exp_Ch6 is
if Nkind (Par) = N_Assignment_Statement then if Nkind (Par) = N_Assignment_Statement then
Append_To (Actuals, Append_To (Actuals,
Make_Parameter_Association (Loc, Make_Parameter_Association (Loc,
Selector_Name => Make_Identifier (Loc, Chars (Last_Formal)), Selector_Name =>
Explicit_Actual_Parameter => Name (Par))); Make_Identifier (Loc, Chars (Last_Formal)),
Explicit_Actual_Parameter => Name (Par)));
Rewrite (Par, Rewrite (Par,
Make_Procedure_Call_Statement (Loc, Make_Procedure_Call_Statement (Loc,
Name => New_Occurrence_Of (Proc_Id, Loc), Name => New_Occurrence_Of (Proc_Id, Loc),
...@@ -8404,9 +8406,11 @@ package body Exp_Ch6 is ...@@ -8404,9 +8406,11 @@ package body Exp_Ch6 is
Append_To (Actuals, Append_To (Actuals,
Make_Parameter_Association (Loc, Make_Parameter_Association (Loc,
Selector_Name => Make_Identifier (Loc, Chars (Last_Formal)), Selector_Name =>
Explicit_Actual_Parameter => Make_Identifier (Loc, Chars (Last_Formal)),
New_Occurrence_Of (Temp_Id, Loc))); Explicit_Actual_Parameter =>
New_Occurrence_Of (Temp_Id, Loc)));
Call := Call :=
Make_Procedure_Call_Statement (Loc, Make_Procedure_Call_Statement (Loc,
Name => New_Occurrence_Of (Proc_Id, Loc), Name => New_Occurrence_Of (Proc_Id, Loc),
......
...@@ -1035,6 +1035,7 @@ package body SPARK_Specific is ...@@ -1035,6 +1035,7 @@ package body SPARK_Specific is
-- If this was a library-level subprogram then replace Result with -- If this was a library-level subprogram then replace Result with
-- its Unit, which points to N_Subprogram_* node. -- its Unit, which points to N_Subprogram_* node.
if Nkind (Result) = N_Compilation_Unit then if Nkind (Result) = N_Compilation_Unit then
Result := Unit (Result); Result := Unit (Result);
end if; end if;
......
...@@ -186,8 +186,8 @@ package body System.OS_Lib is ...@@ -186,8 +186,8 @@ package body System.OS_Lib is
is is
Max_Args : constant Integer := Arg_String'Length; Max_Args : constant Integer := Arg_String'Length;
New_Argv : Argument_List (1 .. Max_Args); New_Argv : Argument_List (1 .. Max_Args);
New_Argc : Natural := 0;
Idx : Integer; Idx : Integer;
New_Argc : Natural := 0;
Cleaned : String (1 .. Arg_String'Length); Cleaned : String (1 .. Arg_String'Length);
Cleaned_Idx : Natural; Cleaned_Idx : Natural;
...@@ -202,8 +202,8 @@ package body System.OS_Lib is ...@@ -202,8 +202,8 @@ package body System.OS_Lib is
exit when Idx > Arg_String'Last; exit when Idx > Arg_String'Last;
declare declare
Quoted : Boolean := False;
Backqd : Boolean := False; Backqd : Boolean := False;
Quoted : Boolean := False;
begin begin
Cleaned_Idx := Cleaned'First; Cleaned_Idx := Cleaned'First;
......
...@@ -597,8 +597,8 @@ package body Sem_Ch8 is ...@@ -597,8 +597,8 @@ package body Sem_Ch8 is
begin begin
-- If the entity pointer is already set, this is an internal node, or a -- If the entity pointer is already set, this is an internal node, or a
-- node that is analyzed more than once, after a tree modification. In -- node that is analyzed more than once, after a tree modification. In
-- such a case there is no resolution to perform, just set the type. -- such a case there is no resolution to perform, just set the type. In
-- In either case, start by analyzing the prefix. -- either case, start by analyzing the prefix.
Analyze (Prefix (N)); Analyze (Prefix (N));
...@@ -5622,9 +5622,9 @@ package body Sem_Ch8 is ...@@ -5622,9 +5622,9 @@ package body Sem_Ch8 is
if Ada_Version >= Ada_2012 if Ada_Version >= Ada_2012
and then and then
(Nkind (Parent (N)) in N_Subexpr (Nkind (Parent (N)) in N_Subexpr
or else Nkind_In (Parent (N), N_Object_Declaration, or else Nkind_In (Parent (N), N_Assignment_Statement,
N_Parameter_Association, N_Object_Declaration,
N_Assignment_Statement)) N_Parameter_Association))
then then
Check_Implicit_Dereference (N, Etype (E)); Check_Implicit_Dereference (N, Etype (E));
end if; end if;
......
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