gnatcmd.adb, [...]: Minor reformatting
2010-09-09 Robert Dewar <dewar@adacore.com> * gnatcmd.adb, gnatlink.adb, sem_ch12.adb, sem_eval.adb, sinput-p.adb: Minor reformatting From-SVN: r164099
This commit is contained in:
parent
a8cc3e468e
commit
f08b23714f
|
@ -1,3 +1,8 @@
|
||||||
|
2010-09-09 Robert Dewar <dewar@adacore.com>
|
||||||
|
|
||||||
|
* gnatcmd.adb, gnatlink.adb, sem_ch12.adb, sem_eval.adb, sinput-p.adb:
|
||||||
|
Minor reformatting
|
||||||
|
|
||||||
2010-09-09 Robert Dewar <dewar@adacore.com>
|
2010-09-09 Robert Dewar <dewar@adacore.com>
|
||||||
|
|
||||||
* impunit.adb: Add entry for a-izteio.
|
* impunit.adb: Add entry for a-izteio.
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
with GNAT.Directory_Operations; use GNAT.Directory_Operations;
|
with GNAT.Directory_Operations; use GNAT.Directory_Operations;
|
||||||
|
|
||||||
with Csets;
|
with Csets;
|
||||||
|
with Hostparm; use Hostparm;
|
||||||
with Makeutl; use Makeutl;
|
with Makeutl; use Makeutl;
|
||||||
with MLib.Tgt; use MLib.Tgt;
|
with MLib.Tgt; use MLib.Tgt;
|
||||||
with MLib.Utl;
|
with MLib.Utl;
|
||||||
|
@ -46,17 +47,14 @@ with Table;
|
||||||
with Targparm;
|
with Targparm;
|
||||||
with Tempdir;
|
with Tempdir;
|
||||||
with Types; use Types;
|
with Types; use Types;
|
||||||
with Hostparm; use Hostparm;
|
with VMS_Conv; use VMS_Conv;
|
||||||
-- Used to determine if we are in VMS or not for error message purposes
|
with VMS_Cmds; use VMS_Cmds;
|
||||||
|
|
||||||
with Ada.Characters.Handling; use Ada.Characters.Handling;
|
with Ada.Characters.Handling; use Ada.Characters.Handling;
|
||||||
with Ada.Command_Line; use Ada.Command_Line;
|
with Ada.Command_Line; use Ada.Command_Line;
|
||||||
with Ada.Text_IO; use Ada.Text_IO;
|
with Ada.Text_IO; use Ada.Text_IO;
|
||||||
|
|
||||||
with GNAT.OS_Lib; use GNAT.OS_Lib;
|
with GNAT.OS_Lib; use GNAT.OS_Lib;
|
||||||
|
|
||||||
with VMS_Conv; use VMS_Conv;
|
|
||||||
with VMS_Cmds; use VMS_Cmds;
|
|
||||||
|
|
||||||
procedure GNATCmd is
|
procedure GNATCmd is
|
||||||
Project_Node_Tree : Project_Node_Tree_Ref;
|
Project_Node_Tree : Project_Node_Tree_Ref;
|
||||||
|
|
|
@ -2145,14 +2145,15 @@ begin
|
||||||
-- Remove duplicate IDENTIFICATION directives (VMS)
|
-- Remove duplicate IDENTIFICATION directives (VMS)
|
||||||
|
|
||||||
if Linker_Options.Table (J)'Length > 29
|
if Linker_Options.Table (J)'Length > 29
|
||||||
and then Linker_Options.Table (J) (1 .. 30)
|
and then Linker_Options.Table (J) (1 .. 30) =
|
||||||
= "--for-linker=--identification="
|
"--for-linker=--identification="
|
||||||
then
|
then
|
||||||
if IDENT_Op then
|
if IDENT_Op then
|
||||||
Linker_Options.Table (J .. Linker_Options.Last - 1) :=
|
Linker_Options.Table (J .. Linker_Options.Last - 1) :=
|
||||||
Linker_Options.Table (J + 1 .. Linker_Options.Last);
|
Linker_Options.Table (J + 1 .. Linker_Options.Last);
|
||||||
Linker_Options.Decrement_Last;
|
Linker_Options.Decrement_Last;
|
||||||
Num_Args := Num_Args - 1;
|
Num_Args := Num_Args - 1;
|
||||||
|
|
||||||
else
|
else
|
||||||
IDENT_Op := True;
|
IDENT_Op := True;
|
||||||
end if;
|
end if;
|
||||||
|
|
|
@ -11240,9 +11240,10 @@ package body Sem_Ch12 is
|
||||||
-- block can be involved, because the parent instances have
|
-- block can be involved, because the parent instances have
|
||||||
-- been installed within it.
|
-- been installed within it.
|
||||||
|
|
||||||
Cur_P := P;
|
|
||||||
if Ekind (P) = E_Block then
|
if Ekind (P) = E_Block then
|
||||||
Cur_P := Scope (Cur_P);
|
Cur_P := Scope (P);
|
||||||
|
else
|
||||||
|
Cur_P := P;
|
||||||
end if;
|
end if;
|
||||||
|
|
||||||
if Is_Generic_Instance (Cur_P) and then P /= Current_Scope then
|
if Is_Generic_Instance (Cur_P) and then P /= Current_Scope then
|
||||||
|
|
|
@ -642,10 +642,12 @@ package body Sem_Eval is
|
||||||
-- types, since we may have two NaN values and they should never
|
-- types, since we may have two NaN values and they should never
|
||||||
-- compare equal.
|
-- compare equal.
|
||||||
|
|
||||||
-- If the entity is a discriminant, the two expressions may be
|
-- If the entity is a discriminant, the two expressions may be bounds
|
||||||
-- bounds of components of objects of the same discriminated
|
-- of components of objects of the same discriminated type. The
|
||||||
-- type. The values of the discriminants are not static, and
|
-- values of the discriminants are not static, and therefore the
|
||||||
-- therefore the result is unknown.
|
-- result is unknown.
|
||||||
|
|
||||||
|
-- It would be better to comment individual branches of this test ???
|
||||||
|
|
||||||
if Nkind_In (Lf, N_Identifier, N_Expanded_Name)
|
if Nkind_In (Lf, N_Identifier, N_Expanded_Name)
|
||||||
and then Nkind_In (Rf, N_Identifier, N_Expanded_Name)
|
and then Nkind_In (Rf, N_Identifier, N_Expanded_Name)
|
||||||
|
|
|
@ -151,7 +151,7 @@ package body Sinput.P is
|
||||||
|
|
||||||
function Source_File_Is_Subunit (X : Source_File_Index) return Boolean is
|
function Source_File_Is_Subunit (X : Source_File_Index) return Boolean is
|
||||||
begin
|
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
|
if X = No_Source_File then
|
||||||
return False;
|
return False;
|
||||||
|
|
Loading…
Reference in New Issue