From f08b23714ff4412ef37672bc120499801f9561b8 Mon Sep 17 00:00:00 2001 From: Robert Dewar Date: Thu, 9 Sep 2010 13:50:19 +0000 Subject: [PATCH] gnatcmd.adb, [...]: Minor reformatting 2010-09-09 Robert Dewar * gnatcmd.adb, gnatlink.adb, sem_ch12.adb, sem_eval.adb, sinput-p.adb: Minor reformatting From-SVN: r164099 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/gnatcmd.adb | 10 ++++------ gcc/ada/gnatlink.adb | 5 +++-- gcc/ada/sem_ch12.adb | 5 +++-- gcc/ada/sem_eval.adb | 10 ++++++---- gcc/ada/sinput-p.adb | 2 +- 6 files changed, 22 insertions(+), 15 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index a8a32f982f8..6fb4d82854b 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2010-09-09 Robert Dewar + + * gnatcmd.adb, gnatlink.adb, sem_ch12.adb, sem_eval.adb, sinput-p.adb: + Minor reformatting + 2010-09-09 Robert Dewar * impunit.adb: Add entry for a-izteio. diff --git a/gcc/ada/gnatcmd.adb b/gcc/ada/gnatcmd.adb index 87c8ced55bd..eaac1db3c5d 100644 --- a/gcc/ada/gnatcmd.adb +++ b/gcc/ada/gnatcmd.adb @@ -26,6 +26,7 @@ with GNAT.Directory_Operations; use GNAT.Directory_Operations; with Csets; +with Hostparm; use Hostparm; with Makeutl; use Makeutl; with MLib.Tgt; use MLib.Tgt; with MLib.Utl; @@ -46,17 +47,14 @@ with Table; with Targparm; with Tempdir; with Types; use Types; -with Hostparm; use Hostparm; --- Used to determine if we are in VMS or not for error message purposes +with VMS_Conv; use VMS_Conv; +with VMS_Cmds; use VMS_Cmds; with Ada.Characters.Handling; use Ada.Characters.Handling; with Ada.Command_Line; use Ada.Command_Line; with Ada.Text_IO; use Ada.Text_IO; -with GNAT.OS_Lib; use GNAT.OS_Lib; - -with VMS_Conv; use VMS_Conv; -with VMS_Cmds; use VMS_Cmds; +with GNAT.OS_Lib; use GNAT.OS_Lib; procedure GNATCmd is Project_Node_Tree : Project_Node_Tree_Ref; diff --git a/gcc/ada/gnatlink.adb b/gcc/ada/gnatlink.adb index 62bc1768f64..191021dfc6e 100644 --- a/gcc/ada/gnatlink.adb +++ b/gcc/ada/gnatlink.adb @@ -2145,14 +2145,15 @@ begin -- Remove duplicate IDENTIFICATION directives (VMS) if Linker_Options.Table (J)'Length > 29 - and then Linker_Options.Table (J) (1 .. 30) - = "--for-linker=--identification=" + and then Linker_Options.Table (J) (1 .. 30) = + "--for-linker=--identification=" then if IDENT_Op then Linker_Options.Table (J .. Linker_Options.Last - 1) := Linker_Options.Table (J + 1 .. Linker_Options.Last); Linker_Options.Decrement_Last; Num_Args := Num_Args - 1; + else IDENT_Op := True; end if; diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb index 41459671f3e..b325ccbe89c 100644 --- a/gcc/ada/sem_ch12.adb +++ b/gcc/ada/sem_ch12.adb @@ -11240,9 +11240,10 @@ package body Sem_Ch12 is -- block can be involved, because the parent instances have -- been installed within it. - Cur_P := P; if Ekind (P) = E_Block then - Cur_P := Scope (Cur_P); + Cur_P := Scope (P); + else + Cur_P := P; end if; if Is_Generic_Instance (Cur_P) and then P /= Current_Scope then diff --git a/gcc/ada/sem_eval.adb b/gcc/ada/sem_eval.adb index 68c9ce8bd49..1e2553c2f9d 100644 --- a/gcc/ada/sem_eval.adb +++ b/gcc/ada/sem_eval.adb @@ -642,10 +642,12 @@ package body Sem_Eval is -- types, since we may have two NaN values and they should never -- compare equal. - -- If the entity is a discriminant, the two expressions may be - -- bounds of components of objects of the same discriminated - -- type. The values of the discriminants are not static, and - -- therefore the result is unknown. + -- If the entity is a discriminant, the two expressions may be bounds + -- of components of objects of the same discriminated type. The + -- values of the discriminants are not static, and therefore the + -- result is unknown. + + -- It would be better to comment individual branches of this test ??? if Nkind_In (Lf, N_Identifier, N_Expanded_Name) and then Nkind_In (Rf, N_Identifier, N_Expanded_Name) diff --git a/gcc/ada/sinput-p.adb b/gcc/ada/sinput-p.adb index 568131449d2..cd513d01080 100644 --- a/gcc/ada/sinput-p.adb +++ b/gcc/ada/sinput-p.adb @@ -151,7 +151,7 @@ package body Sinput.P is function Source_File_Is_Subunit (X : Source_File_Index) return Boolean is begin - -- Nothing to do if X is null. So, simply return False. + -- Nothing to do if X is no source file, so simply return False if X = No_Source_File then return False;