diff options
| author | Robert Dewar <dewar@adacore.com> | 2012-10-02 08:48:27 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2012-10-02 10:48:27 +0200 |
| commit | 9b16cb57dedec3d7fb690ad7770f2ca9ca85f586 (patch) | |
| tree | 427db6631f4424c39ebbfe7c953d008cfee86519 /gcc/ada/scng.adb | |
| parent | cb42ba5d667142c60c27fadd8efba35e0e18e797 (diff) | |
| download | gcc-9b16cb57dedec3d7fb690ad7770f2ca9ca85f586.zip gcc-9b16cb57dedec3d7fb690ad7770f2ca9ca85f586.tar.gz gcc-9b16cb57dedec3d7fb690ad7770f2ca9ca85f586.tar.bz2 | |
par_sco.adb, [...]: Change name Conditional_Expression to If_Expression.
2012-10-02 Robert Dewar <dewar@adacore.com>
* par_sco.adb, sem_ch3.adb, layout.adb, exp_ch7.adb, exp_imgv.adb,
exp_util.adb, exp_util.ads, exp_attr.adb, sinfo.adb, sinfo.ads,
exp_ch9.adb, style.ads, scos.ads, debug.adb, einfo.ads, scng.adb,
checks.adb, checks.ads, sem.adb, par-ch4.adb, sem_util.adb, types.h,
sem_res.adb, expander.adb, scans.ads, par.adb, exp_ch2.adb,
gnat1drv.adb, stylesw.ads, sem_elab.adb, exp_ch4.adb, exp_ch4.ads,
exp_ch6.adb, sem_ch4.adb, sem_ch4.ads, sem_ch6.adb,
opt.ads, sem_eval.adb, sem_eval.ads, exp_intr.adb, sprint.adb,
sprint.ads, styleg.ads: Change name Conditional_Expression to
If_Expression.
* gcc-interface/trans.c (gnat_to_gnu): Replace
N_Conditional_Expression by N_If_Expression.
* gcc-interface/Make-lang.in: Update dependencies.
From-SVN: r191967
Diffstat (limited to 'gcc/ada/scng.adb')
| -rw-r--r-- | gcc/ada/scng.adb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/ada/scng.adb b/gcc/ada/scng.adb index b0a17db..ce644bc 100644 --- a/gcc/ada/scng.adb +++ b/gcc/ada/scng.adb @@ -2742,13 +2742,13 @@ package body Scng is end if; -- Check THEN/ELSE style rules. These do not apply to AND THEN - -- or OR ELSE, and do not apply in conditional expressions. + -- or OR ELSE, and do not apply in if expressions. if (Token = Tok_Then and then Prev_Token /= Tok_And) or else (Token = Tok_Else and then Prev_Token /= Tok_Or) then - if Inside_Conditional_Expression = 0 then + if Inside_If_Expression = 0 then Style.Check_Separate_Stmt_Lines; end if; end if; |