2010-09-10 Robert Dewar <dewar@adacore.com>

	* gnatlink.adb, prj-ext.adb, prj-util.adb, s-tporft.adb,
	sem_ch3.adb: Minor reformatting.



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

6 files changed, 38 insertions, 34 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index d6a96deac3a..e03ced62b80 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-10  Robert Dewar  <dewar@adacore.com>
+
+	* gnatlink.adb, prj-ext.adb, prj-util.adb, s-tporft.adb,
+	sem_ch3.adb: Minor reformatting.
+
 2010-09-10  Ed Schonberg  <schonberg@adacore.com>
 
 	* sem_ch3.adb (Derive_Subprograms): An interface primitive operation
diff --git a/gcc/ada/gnatlink.adb b/gcc/ada/gnatlink.adb
index 3cf65eb2d47..47397c5c92c 100644
--- a/gcc/ada/gnatlink.adb
+++ b/gcc/ada/gnatlink.adb
@@ -41,10 +41,10 @@ with Table;
 with Targparm; use Targparm;
 with Types;
 
-with Ada.Command_Line;     use Ada.Command_Line;
-with Ada.Exceptions;       use Ada.Exceptions;
+with Ada.Command_Line; use Ada.Command_Line;
+with Ada.Exceptions;   use Ada.Exceptions;
 
-with System.OS_Lib;        use System.OS_Lib;
+with System.OS_Lib; use System.OS_Lib;
 with System.CRTL;
 
 with Interfaces.C_Streams; use Interfaces.C_Streams;
@@ -200,11 +200,11 @@ procedure Gnatlink is
    --  Return just the file name part without the extension (if present)
 
    procedure Check_Existing_Executable (File_Name : String);
-   --  Delete any existing executable to avoid accidentally updating
-   --  the target of a symbolic link, but produce a Fatail_Error if
-   --  File_Name matches any of the source file names. This avoids
-   --  overwriting of extensionless source files by accident on systems
-   --  where executables do not have extensions.
+   --  Delete any existing executable to avoid accidentally updating the target
+   --  of a symbolic link, but produce a Fatail_Error if File_Name matches any
+   --  of the source file names. This avoids overwriting of extensionless
+   --  source files by accident on systems where executables do not have
+   --  extensions.
 
    procedure Delete (Name : String);
    --  Wrapper to unlink as status is ignored by this application
@@ -273,6 +273,7 @@ procedure Gnatlink is
       Ename : String := File_Name;
       Efile : File_Name_Type;
       Sfile : File_Name_Type;
+
    begin
       Canonical_Case_File_Name (Ename);
       Name_Len := 0;
diff --git a/gcc/ada/prj-ext.adb b/gcc/ada/prj-ext.adb
index 77d3379a302..40816cf24de 100644
--- a/gcc/ada/prj-ext.adb
+++ b/gcc/ada/prj-ext.adb
@@ -250,8 +250,8 @@ package body Prj.Ext is
                Prefix := new String'(Executable_Prefix_Path);
 
                if Prefix.all /= "" then
-                  if Tree.Target_Name /= null and then
-                    Tree.Target_Name.all /= ""
+                  if Tree.Target_Name /= null
+                    and then Tree.Target_Name.all /= ""
                   then
                      Add_Str_To_Name_Buffer
                        (Path_Separator & Prefix.all &
diff --git a/gcc/ada/prj-util.adb b/gcc/ada/prj-util.adb
index 7700b8ec19f..43e51012dcf 100644
--- a/gcc/ada/prj-util.adb
+++ b/gcc/ada/prj-util.adb
@@ -188,11 +188,12 @@ package body Prj.Util is
             return Result;
 
          elsif Builder_Package /= No_Package then
-            --  We still want to take into account cases where the suffix is
-            --  specified in the project itself, as opposed to the config file.
-            --  Unfortunately, when the project was processed, they are both
-            --  stored in Project.Config, so we need to get it from the project
-            --  again
+
+            --  If the suffix is specified in the project itself, as
+            --  opposed to the config file, it needs to be taken into account.
+            --  Unfortunately, when the project was processed, in both cases
+            --  the suffix is stored in Project.Config, so get it from the
+            --  project again.
 
             Suffix_From_Project :=
               Prj.Util.Value_Of
diff --git a/gcc/ada/s-tporft.adb b/gcc/ada/s-tporft.adb
index 3d621853ef2..58badd6722a 100644
--- a/gcc/ada/s-tporft.adb
+++ b/gcc/ada/s-tporft.adb
@@ -93,13 +93,11 @@ begin
    System.Soft_Links.Create_TSD (Self_Id.Common.Compiler_Data);
 
    --  ???
-   --  The following call is commented out to avoid dependence on
-   --  the System.Tasking.Initialization package.
-   --  It seems that if we want Ada.Task_Attributes to work correctly
-   --  for C threads we will need to raise the visibility of this soft
-   --  link to System.Soft_Links.
-   --  We are putting that off until this new functionality is otherwise
-   --  stable.
+   --  The following call is commented out to avoid dependence on the
+   --  System.Tasking.Initialization package. It seems that if we want
+   --  Ada.Task_Attributes to work correctly for C threads we will need to
+   --  raise the visibility of this soft link to System.Soft_Links. We are
+   --  putting that off until this new functionality is otherwise stable.
 
    --  System.Tasking.Initialization.Initialize_Attributes_Link.all (T);
 
diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
index 709ad218b63..1a43ed6b8e5 100644
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -12962,20 +12962,19 @@ package body Sem_Ch3 is
             then
                null;
 
-            --  Case 2: Inherit entities associated with interfaces that
-            --  were not covered by the parent type. We exclude here null
-            --  interface primitives because they do not need special
-            --  management.
-            --  We also exclude interface operations that are renamings.
-            --  If the subprogram is an explicit renaming of an interface
-            --  primitive, it is a regular primitive operation, and the
-            --  presence of its alias is not relevant: it has to be derived
-            --  like any other primitive.
+            --  Case 2: Inherit entities associated with interfaces that were
+            --  not covered by the parent type. We exclude here null interface
+            --  primitives because they do not need special management.
+
+            --  We also exclude interface operations that are renamings. If the
+            --  subprogram is an explicit renaming of an interface primitive,
+            --  it is a regular primitive operation, and the presence of its
+            --  alias is not relevant: it has to be derived like any other
+            --  primitive.
 
             elsif Present (Alias (Subp))
-              and then
-                Nkind (Unit_Declaration_Node (Subp))
-                  /= N_Subprogram_Renaming_Declaration
+              and then Nkind (Unit_Declaration_Node (Subp)) /=
+                                            N_Subprogram_Renaming_Declaration
               and then Is_Interface (Find_Dispatching_Type (Alias_Subp))
               and then not
                 (Nkind (Parent (Alias_Subp)) = N_Procedure_Specification