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

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index bb6af69ca5097e894bcc1ba513e3fc72e6021fed..e18d49bb91f30f4b3b570972e20648ce65b07064 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+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>
 
        * lib-xref-spark_specific.adb

diff --git a/gcc/ada/a-dirval-mingw.adb b/gcc/ada/a-dirval-mingw.adb
index de3b566274edc39861e6694ca807e0067fa45a88..dad5c4ae8a460d0a7ae40566e3c9c363e23dffb6 100644 (file)
--- a/gcc/ada/a-dirval-mingw.adb
+++ b/gcc/ada/a-dirval-mingw.adb
@@ -77,8 +77,7 @@ package body Ada.Directories.Validity is
          if Name'Length >= 2
            and then  Name (Start + 1) = ':'
            and then
-            (Name (Start) in 'A' .. 'Z'
-             or else Name (Start) in 'a' .. 'z')
+             (Name (Start) in 'A' .. 'Z' or else Name (Start) in 'a' .. 'z')
          then
             Start := Start + 2;
 

diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb
index dc03396ee42f46f1eed9831b82a959dd4f7d7ca3..deaa8eab9d973ea53de8d5ebf48520fd3d2da62b 100644 (file)
--- a/gcc/ada/exp_ch6.adb
+++ b/gcc/ada/exp_ch6.adb
@@ -8332,16 +8332,16 @@ package body Exp_Ch6 is
       Func_Id     : constant Entity_Id  := Entity (Name (N));
       Func_Decl   : constant Node_Id    := Unit_Declaration_Node (Func_Id);
       Par         : constant Node_Id    := Parent (N);
-      Loc         : constant Source_Ptr := Sloc (Par);
       Proc_Id     : constant Entity_Id  := Defining_Entity (Next (Func_Decl));
+      Loc         : constant Source_Ptr := Sloc (Par);
       Actuals     : List_Id;
       Last_Formal : Entity_Id;
 
    begin
-      --  The actuals may be given by named associations, so the added
-      --  actual that is the target of the return value of the call must
-      --  be a named association as well, so we retrieve the name of the
-      --  generated out_formal.
+      --  The actuals may be given by named associations, so the added actual
+      --  that is the target of the return value of the call must be a named
+      --  association as well, so we retrieve the name of the generated
+      --  out_formal.
 
       Last_Formal := First_Formal (Proc_Id);
       while Present (Next_Formal (Last_Formal)) loop
@@ -8366,8 +8366,10 @@ package body Exp_Ch6 is
       if Nkind (Par) = N_Assignment_Statement then
          Append_To (Actuals,
            Make_Parameter_Association (Loc,
-              Selector_Name => Make_Identifier (Loc, Chars (Last_Formal)),
-               Explicit_Actual_Parameter => Name (Par)));
+             Selector_Name             =>
+               Make_Identifier (Loc, Chars (Last_Formal)),
+             Explicit_Actual_Parameter => Name (Par)));
+
          Rewrite (Par,
            Make_Procedure_Call_Statement (Loc,
              Name                   => New_Occurrence_Of (Proc_Id, Loc),
@@ -8404,9 +8406,11 @@ package body Exp_Ch6 is
 
             Append_To (Actuals,
               Make_Parameter_Association (Loc,
-                 Selector_Name => Make_Identifier (Loc, Chars (Last_Formal)),
-               Explicit_Actual_Parameter =>
-                 New_Occurrence_Of (Temp_Id, Loc)));
+                Selector_Name             =>
+                  Make_Identifier (Loc, Chars (Last_Formal)),
+                Explicit_Actual_Parameter =>
+                  New_Occurrence_Of (Temp_Id, Loc)));
+
             Call :=
               Make_Procedure_Call_Statement (Loc,
                 Name                   => New_Occurrence_Of (Proc_Id, Loc),

diff --git a/gcc/ada/lib-xref-spark_specific.adb b/gcc/ada/lib-xref-spark_specific.adb
index fce0cf09d25596b6f4c2784fddbf5cfb75de2b35..3280d184a15188f90148dcef0f08293f925cbbd8 100644 (file)
--- a/gcc/ada/lib-xref-spark_specific.adb
+++ b/gcc/ada/lib-xref-spark_specific.adb
@@ -1035,6 +1035,7 @@ package body SPARK_Specific is
 
          --  If this was a library-level subprogram then replace Result with
          --  its Unit, which points to N_Subprogram_* node.
+
          if Nkind (Result) = N_Compilation_Unit then
             Result := Unit (Result);
          end if;

diff --git a/gcc/ada/s-os_lib.adb b/gcc/ada/s-os_lib.adb
index 573b738541dd596517010390ecfad51f52573a12..02efbd71406a472e03e4027c54ebfa810b8abb5a 100644 (file)
--- a/gcc/ada/s-os_lib.adb
+++ b/gcc/ada/s-os_lib.adb
@@ -186,8 +186,8 @@ package body System.OS_Lib is
    is
       Max_Args : constant Integer := Arg_String'Length;
       New_Argv : Argument_List (1 .. Max_Args);
-      New_Argc : Natural := 0;
       Idx      : Integer;
+      New_Argc : Natural := 0;
 
       Cleaned     : String (1 .. Arg_String'Length);
       Cleaned_Idx : Natural;
@@ -202,8 +202,8 @@ package body System.OS_Lib is
          exit when Idx > Arg_String'Last;
 
          declare
-            Quoted  : Boolean := False;
             Backqd  : Boolean := False;
+            Quoted  : Boolean := False;
 
          begin
             Cleaned_Idx := Cleaned'First;

diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb
index f02ec524340786ac57a035ec41822d56fcc8a2c9..d4487124e6b1ba430ffe884d729f9207fca136c1 100644 (file)
--- a/gcc/ada/sem_ch8.adb
+++ b/gcc/ada/sem_ch8.adb
@@ -597,8 +597,8 @@ package body Sem_Ch8 is
    begin
       --  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
-      --  such a case there is no resolution to perform, just set the type.
-      --  In either case, start by analyzing the prefix.
+      --  such a case there is no resolution to perform, just set the type. In
+      --  either case, start by analyzing the prefix.
 
       Analyze (Prefix (N));
 
@@ -5622,9 +5622,9 @@ package body Sem_Ch8 is
             if Ada_Version >= Ada_2012
               and then
                 (Nkind (Parent (N)) in N_Subexpr
-                  or else Nkind_In (Parent (N), N_Object_Declaration,
-                                                N_Parameter_Association,
-                                                N_Assignment_Statement))
+                  or else Nkind_In (Parent (N), N_Assignment_Statement,
+                                                N_Object_Declaration,
+                                                N_Parameter_Association))
             then
                Check_Implicit_Dereference (N, Etype (E));
             end if;