diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-08-04 09:51:08 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-08-04 09:51:08 +0200 |
| commit | 2c1b72d7b658ecef2cd2cb7b09f5a7fcb40b3ea4 (patch) | |
| tree | a8ac044fa68b27fb08b03dcef40c1e31eadc0c99 /gcc/ada/par_sco.adb | |
| parent | 824e9320157031e3969aabe742cfddd38a0513cd (diff) | |
| download | gcc-2c1b72d7b658ecef2cd2cb7b09f5a7fcb40b3ea4.zip gcc-2c1b72d7b658ecef2cd2cb7b09f5a7fcb40b3ea4.tar.gz gcc-2c1b72d7b658ecef2cd2cb7b09f5a7fcb40b3ea4.tar.bz2 | |
[multiple changes]
2011-08-04 Robert Dewar <dewar@adacore.com>
* par_sco.adb, prj-proc.adb, make.adb, bindgen.adb, prj.adb, prj.ads,
makeutl.adb, makeutl.ads, prj-nmsc.adb, exp_ch5.adb, exp_ch12.adb,
exp_ch7.ads, exp_util.ads, sem_util.ads, g-comlin.ads, exp_ch6.adb,
exp_ch6.ads, lib-xref.ads, exp_ch7.adb, exp_util.adb, exp_dist.adb,
exp_strm.adb, gnatcmd.adb, freeze.adb, g-comlin.adb, lib-xref-alfa.adb,
sem_attr.adb, sem_prag.adb, sem_util.adb, sem_elab.adb, sem_ch8.adb,
sem_ch11.adb, sem_eval.adb, sem_ch13.adb, sem_disp.adb, a-fihema.adb:
Minor reformatting and code reorganization.
2011-08-04 Emmanuel Briot <briot@adacore.com>
* projects.texi: Added doc for aggregate projects.
From-SVN: r177320
Diffstat (limited to 'gcc/ada/par_sco.adb')
| -rw-r--r-- | gcc/ada/par_sco.adb | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/gcc/ada/par_sco.adb b/gcc/ada/par_sco.adb index 67076f5..6c31eab 100644 --- a/gcc/ada/par_sco.adb +++ b/gcc/ada/par_sco.adb @@ -440,7 +440,7 @@ package body Par_SCO is ------------------- procedure Output_Header (T : Character) is - Loc : Source_Ptr := No_Location; + Loc : Source_Ptr := No_Location; -- Node whose sloc is used for the decision begin @@ -454,8 +454,8 @@ package body Par_SCO is when 'G' | 'P' => - -- For entry, the token sloc is from the N_Entry_Body. - -- For PRAGMA, we must get the location from the pragma node. + -- For entry, the token sloc is from the N_Entry_Body. For + -- PRAGMA, we must get the location from the pragma node. -- Argument N is the pragma argument, and we have to go up two -- levels (through the pragma argument association) to get to -- the pragma node itself. @@ -482,10 +482,11 @@ package body Par_SCO is Last => False); if T = 'P' then - -- For pragmas we also must make an entry in the hash table - -- for later access by Set_SCO_Pragma_Enabled. We set the - -- pragma as disabled now, the call will change C2 to 'e' - -- to enable the pragma header entry. + + -- For pragmas we also must make an entry in the hash table for + -- later access by Set_SCO_Pragma_Enabled. We set the pragma as + -- disabled now, the call will change C2 to 'e' to enable the + -- pragma header entry. SCO_Table.Table (SCO_Table.Last).C2 := 'd'; Condition_Pragma_Hash_Table.Set (Loc, SCO_Table.Last); @@ -792,6 +793,7 @@ package body Par_SCO is Traverse_Generic_Instantiation (Lu); when others => + -- All other cases of compilation units (e.g. renamings), generate -- no SCO information. @@ -1156,11 +1158,14 @@ package body Par_SCO is declare Cond : constant Node_Id := Condition (Entry_Body_Formal_Part (N)); + begin Set_Statement_Entry; + if Present (Cond) then Process_Decisions_Defer (Cond, 'G'); end if; + Traverse_Subprogram_Or_Task_Body (N); end; |