2009-11-30 Robert Dewar <dewar@adacore.com>

	* makeutl.adb, makeutl.ads, prj-proc.adb, prj.adb, prj.ads: Minor
	reformatting.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@154783 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 32 insertions, 28 deletions

diff --git a/gcc/ada/makeutl.ads b/gcc/ada/makeutl.ads
index 915c00afcf1..a7614f399c4 100644
--- a/gcc/ada/makeutl.ads
+++ b/gcc/ada/makeutl.ads
@@ -66,8 +66,8 @@ package Makeutl is
      (Main            : String;
       Main_Index      : Int;
       Index_Separator : Character) return File_Name_Type;
-   --  Returns the base name of Main, without the extension, plus the
-   --  Index_Separator followed by the Main_Index, if Main_Index is not 0.
+   --  Returns the base name of Main, without the extension, followed by the
+   --  Index_Separator followed by the Main_Index if it is non-zero.
 
    function Executable_Prefix_Path return String;
    --  Return the absolute path parent directory of the directory where the
@@ -87,9 +87,9 @@ package Makeutl is
    --  one of its source. Returns False otherwise.
 
    function Check_Source_Info_In_ALI (The_ALI : ALI.ALI_Id) return Boolean;
-   --  Check whether all file references in ALI are still valid (ie the
+   --  Check whether all file references in ALI are still valid (i.e. the
    --  source files are still associated with the same units). Return True
-   --  if everything is still valid
+   --  if everything is still valid.
 
    function Is_External_Assignment
      (Tree : Prj.Tree.Project_Node_Tree_Ref;
@@ -121,11 +121,11 @@ package Makeutl is
       S2                : String  := "";
       Prefix            : String  := "  -> ";
       Minimum_Verbosity : Opt.Verbosity_Level_Type := Opt.Low);
-   --  If the verbose flag (Verbose_Mode) is set and the verbosity level is
-   --  at least equal to Minimum_Verbosity, then print Prefix to standard
-   --  output followed by N1 and S1. If N2 /= No_Name then N2 is printed after
-   --  S1. S2 is printed last. Both N1 and N2 are printed in quotation marks.
-   --  The two forms differ only in taking Name_Id or File_name_Type arguments.
+   --  If the verbose flag (Verbose_Mode) is set and the verbosity level is at
+   --  least equal to Minimum_Verbosity, then print Prefix to standard output
+   --  followed by N1 and S1. If N2 /= No_Name then N2 is printed after S1. S2
+   --  is printed last. Both N1 and N2 are printed in quotation marks. The two
+   --  forms differ only in taking Name_Id or File_name_Type arguments.
 
    function Linker_Options_Switches
      (Project  : Project_Id;
@@ -142,10 +142,30 @@ package Makeutl is
    --  Find the index of a unit in a source file. Return zero if the file is
    --  not a multi-unit source file.
 
-   package Mains is
+   procedure Test_If_Relative_Path
+     (Switch               : in out String_Access;
+      Parent               : String;
+      Including_L_Switch   : Boolean := True;
+      Including_Non_Switch : Boolean := True;
+      Including_RTS        : Boolean := False);
+   --  Test if Switch is a relative search path switch. If it is, fail if
+   --  Parent is the empty string, otherwise prepend the path with Parent.
+   --  This subprogram is only called when using project files. For gnatbind
+   --  switches, Including_L_Switch is False, because the argument of the -L
+   --  switch is not a path. If Including_RTS is True, process also switches
+   --  --RTS=.
 
-      --  Mains are stored in a table. An index is used to retrieve the mains
-      --  from the table.
+   function Path_Or_File_Name (Path : Path_Name_Type) return String;
+   --  Returns a file name if -df is used, otherwise return a path name
+
+   -----------
+   -- Mains --
+   -----------
+
+   --  Mains are stored in a table. An index is used to retrieve the mains
+   --  from the table.
+
+   package Mains is
 
       procedure Add_Main (Name : String);
       --  Add one main to the table
@@ -180,22 +200,6 @@ package Makeutl is
 
    end Mains;
 
-   procedure Test_If_Relative_Path
-     (Switch               : in out String_Access;
-      Parent               : String;
-      Including_L_Switch   : Boolean := True;
-      Including_Non_Switch : Boolean := True;
-      Including_RTS        : Boolean := False);
-   --  Test if Switch is a relative search path switch. If it is, fail if
-   --  Parent is the empty string, otherwise prepend the path with Parent.
-   --  This subprogram is only called when using project files. For gnatbind
-   --  switches, Including_L_Switch is False, because the argument of the -L
-   --  switch is not a path. If Including_RTS is True, process also switches
-   --  --RTS=.
-
-   function Path_Or_File_Name (Path : Path_Name_Type) return String;
-   --  Returns a file name if -df is used, otherwise return a path name
-
    ----------------------
    -- Marking Routines --
    ----------------------