diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2014-01-20 16:36:52 +0100 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2014-01-20 16:36:52 +0100 |
| commit | 4058ddccde8eaf26b69891ae873016972c87a24b (patch) | |
| tree | 9c64e970d90f9c129794fbb9ef3ce595d46a1011 /gcc/ada/sem.adb | |
| parent | d8a764c4fbaf9df22d41c00df4a2ec53355460d5 (diff) | |
| download | gcc-4058ddccde8eaf26b69891ae873016972c87a24b.zip gcc-4058ddccde8eaf26b69891ae873016972c87a24b.tar.gz gcc-4058ddccde8eaf26b69891ae873016972c87a24b.tar.bz2 | |
[multiple changes]
2014-01-20 Robert Dewar <dewar@adacore.com>
* exp_ch7.adb: Minor reformatting.
* opt.ads: Minor comment updates.
* sem.adb: Minor name change Is_Main_Unit =>
Is_Main_Unit_Or_Main_Unit_Spec.
* sem_ch6.adb: Minor reformatting and code reorganization.
2014-01-20 Bob Duff <duff@adacore.com>
* gnat_ugn.texi: Update gnatpp switches.
2014-01-20 Thomas Quinot <quinot@adacore.com>
* exp_ch9.adb: Minor comment edit.
From-SVN: r206827
Diffstat (limited to 'gcc/ada/sem.adb')
| -rw-r--r-- | gcc/ada/sem.adb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gcc/ada/sem.adb b/gcc/ada/sem.adb index a175014..ced4d41 100644 --- a/gcc/ada/sem.adb +++ b/gcc/ada/sem.adb @@ -1322,15 +1322,14 @@ package body Sem is -- If the main unit is generic, every compiled unit, including its -- context, is compiled with expansion disabled. - -- configuration flags have special settings when compiling a predefined - -- file as a main unit. This applies to its spec as well. - - Is_Main_Unit : constant Boolean := + Is_Main_Unit_Or_Main_Unit_Spec : constant Boolean := Current_Sem_Unit = Main_Unit or else (Nkind (Unit (Cunit (Main_Unit))) = N_Package_Body and then Library_Unit (Cunit (Main_Unit)) = Cunit (Current_Sem_Unit)); + -- Configuration flags have special settings when compiling a predefined + -- file as a main unit. This applies to its spec as well. Ext_Main_Source_Unit : constant Boolean := In_Extended_Main_Source_Unit (Comp_Unit); @@ -1431,7 +1430,7 @@ package body Sem is Save_Opt_Config_Switches (Save_Config_Switches); Set_Opt_Config_Switches (Is_Internal_File_Name (Unit_File_Name (Current_Sem_Unit)), - Is_Main_Unit); + Is_Main_Unit_Or_Main_Unit_Spec); -- Save current non-partition-wide restrictions |