[multiple changes]

2009-04-24  Arnaud Charlet  <charlet@adacore.com>

	* mlib-prj.adb: Use friendlier english identifier.

	* gnatcmd.adb, make.adb: Use better english identifiers.

2009-04-24  Robert Dewar  <dewar@adacore.com>

	* clean.adb: Minor reformatting

From-SVN: r146715

5 files changed, 38 insertions, 20 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 7290aa3..d9b8f01 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,13 @@
+2009-04-24  Arnaud Charlet  <charlet@adacore.com>
+
+	* mlib-prj.adb: Use friendlier english identifier.
+
+	* gnatcmd.adb, make.adb: Use better english identifiers.
+
+2009-04-24  Robert Dewar  <dewar@adacore.com>
+
+	* clean.adb: Minor reformatting
+
 2009-04-24  Robert Dewar  <dewar@adacore.com>
 
 	* einfo.adb (OK_To_Rename): New flag
diff --git a/gcc/ada/clean.adb b/gcc/ada/clean.adb
index 8a70175..ff59a46 100644
--- a/gcc/ada/clean.adb
+++ b/gcc/ada/clean.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 2003-2008, Free Software Foundation, Inc.         --
+--          Copyright (C) 2003-2009, 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- --
@@ -1029,7 +1029,7 @@ package body Clean is
                     Project_Table.Last (Project_Tree.Projects)
                   loop
                      if Has_Foreign_Sources
-                       (Project_Tree.Projects.Table (Proj))
+                          (Project_Tree.Projects.Table (Proj))
                      then
                         Global_Archive := True;
                         exit;
diff --git a/gcc/ada/gnatcmd.adb b/gcc/ada/gnatcmd.adb
index 592d302..86cd095 100644
--- a/gcc/ada/gnatcmd.adb
+++ b/gcc/ada/gnatcmd.adb
@@ -251,8 +251,8 @@ procedure GNATCmd is
    --  Process GNAT LINK, when there is a project file specified
 
    procedure Set_Library_For
-     (Project             : Project_Id;
-      There_Are_Libraries : in out Boolean);
+     (Project           : Project_Id;
+      Libraries_Present : in out Boolean);
    --  If Project is a library project, add the correct -L and -l switches to
    --  the linker invocation.
 
@@ -927,7 +927,7 @@ procedure GNATCmd is
 
    procedure Process_Link is
       Look_For_Executable : Boolean := True;
-      There_Are_Libraries : Boolean := False;
+      Libraries_Present   : Boolean := False;
       Path_Option         : constant String_Access :=
                               MLib.Linker_Library_Path_Option;
       Prj                 : Project_Id := Project;
@@ -946,12 +946,12 @@ procedure GNATCmd is
       --  Check if there are library project files
 
       if MLib.Tgt.Support_For_Libraries /= None then
-         Set_Libraries (Project, Project_Tree, There_Are_Libraries);
+         Set_Libraries (Project, Project_Tree, Libraries_Present);
       end if;
 
       --  If there are, add the necessary additional switches
 
-      if There_Are_Libraries then
+      if Libraries_Present then
 
          --  Add -L<lib_dir> -lgnarl -lgnat -Wl,-rpath,<lib_dir>
 
@@ -1231,8 +1231,8 @@ procedure GNATCmd is
    ---------------------
 
    procedure Set_Library_For
-     (Project             : Project_Id;
-      There_Are_Libraries : in out Boolean)
+     (Project           : Project_Id;
+      Libraries_Present : in out Boolean)
    is
       Path_Option : constant String_Access :=
                       MLib.Linker_Library_Path_Option;
@@ -1241,7 +1241,7 @@ procedure GNATCmd is
       --  Case of library project
 
       if Project_Tree.Projects.Table (Project).Library then
-         There_Are_Libraries := True;
+         Libraries_Present := True;
 
          --  Add the -L switch
 
diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb
index 4478ce9..6f6b687 100644
--- a/gcc/ada/make.adb
+++ b/gcc/ada/make.adb
@@ -4227,7 +4227,7 @@ package body Make is
       Current_Main_Index : Int := 0;
       --  If not zero, the index of the current main unit in its source file
 
-      There_Are_Stand_Alone_Libraries : Boolean := False;
+      Stand_Alone_Libraries : Boolean := False;
       --  Set to True when there are Stand-Alone Libraries, so that gnatbind
       --  is invoked with the -F switch to force checking of elaboration flags.
 
@@ -5773,7 +5773,7 @@ package body Make is
                         if Project_Tree.Projects.Table
                           (Proj1).Standalone_Library
                         then
-                           There_Are_Stand_Alone_Libraries := True;
+                           Stand_Alone_Libraries := True;
                         end if;
 
                         if Project_Tree.Projects.Table (Proj1).Library then
@@ -6109,7 +6109,7 @@ package body Make is
                   Args (J) := Binder_Switches.Table (J);
                end loop;
 
-               if There_Are_Stand_Alone_Libraries then
+               if Stand_Alone_Libraries then
                   Last_Arg := Last_Arg + 1;
                   Args (Last_Arg) := Force_Elab_Flags_String'Access;
                end if;
@@ -6164,7 +6164,7 @@ package body Make is
                Linker_Switches_Last : constant Integer := Linker_Switches.Last;
                Path_Option          : constant String_Access :=
                                         MLib.Linker_Library_Path_Option;
-               There_Are_Libraries  : Boolean := False;
+               Libraries_Present    : Boolean := False;
                Current              : Natural;
                Proj2                : Project_Id;
                Depth                : Natural;
@@ -6193,7 +6193,7 @@ package body Make is
                         then
                            --  Add this project to table Library_Projs
 
-                           There_Are_Libraries := True;
+                           Libraries_Present := True;
                            Depth := Project_Tree.Projects.Table (Proj1).Depth;
                            Library_Projs.Increment_Last;
                            Current := Library_Projs.Last;
@@ -6252,7 +6252,7 @@ package body Make is
                      end loop;
                   end if;
 
-                  if There_Are_Libraries then
+                  if Libraries_Present then
 
                      --  If Path_Option is not null, create the switch
                      --  ("-Wl,-rpath," or equivalent) with all the non static
@@ -7534,10 +7534,15 @@ package body Make is
 
       procedure Recurse (Prj : Project_Id; Depth : Natural);
 
+      -------------
+      -- Recurse --
+      -------------
+
       procedure Recurse (Prj : Project_Id; Depth : Natural) is
          Data : Project_Data renames Project_Tree.Projects.Table (Prj);
          List : Project_List;
          Proj : Project_Id;
+
       begin
          if Data.Depth >= Depth
            or Get (Seen, Prj)
@@ -7569,6 +7574,8 @@ package body Make is
          Set (Seen, Prj, False);
       end Recurse;
 
+   --  Start of processing for Recursive_Compute_Depth
+
    begin
       for Proj in Project_Table.First ..
         Project_Table.Last (Project_Tree.Projects)
@@ -7596,6 +7603,7 @@ package body Make is
 
    procedure Sigint_Intercepted is
       SIGINT  : constant := 2;
+
    begin
       Set_Standard_Error;
       Write_Line ("*** Interrupted ***");
diff --git a/gcc/ada/mlib-prj.adb b/gcc/ada/mlib-prj.adb
index 167dfdb..8b67c04 100644
--- a/gcc/ada/mlib-prj.adb
+++ b/gcc/ada/mlib-prj.adb
@@ -345,7 +345,7 @@ package body MLib.Prj is
 
       In_Main_Object_Directory : Boolean := True;
 
-      There_Are_Foreign_Sources : Boolean;
+      Foreign_Sources : Boolean;
 
       Rpath : String_Access := null;
       --  Allocated only if Path Option is supported
@@ -1351,7 +1351,7 @@ package body MLib.Prj is
 
          In_Main_Object_Directory := True;
 
-         There_Are_Foreign_Sources := Has_Foreign_Sources (Data);
+         Foreign_Sources := Has_Foreign_Sources (Data);
 
          loop
             if Data.Object_Directory /= No_Path_Information then
@@ -1412,7 +1412,7 @@ package body MLib.Prj is
                                     ALI_Path : constant String :=
                                                  Ext_To (C_Object_Path, "ali");
                                     Add_It   : Boolean :=
-                                                 There_Are_Foreign_Sources
+                                                 Foreign_Sources
                                                  or else
                                                    (Last > 5
                                                     and then
@@ -1514,7 +1514,7 @@ package body MLib.Prj is
                                           Check_Libs (ALI_Path, True);
                                        end if;
 
-                                    elsif There_Are_Foreign_Sources then
+                                    elsif Foreign_Sources then
                                        Objects.Append
                                          (new String'(Object_Path));
                                     end if;