diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-10-11 11:11:57 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-10-11 11:11:57 +0200 |
| commit | dbe945f1d543dc34b78b975a9053872c744b295a (patch) | |
| tree | 15c23728dd5f1c1cb5845f7dcdc1c8b0738de698 /gcc/ada/par-ch4.adb | |
| parent | 2b3d67a55b8f6589dd52eea452e464c628d20bdf (diff) | |
| download | gcc-dbe945f1d543dc34b78b975a9053872c744b295a.tar.gz | |
[multiple changes]
2010-10-11 Bob Duff <duff@adacore.com>
* sem_aggr.adb, impunit.adb, impunit.ads, switch-c.adb, usage.adb,
sem_ch10.adb, sem_prag.adb, sem_ch12.adb, par-ch4.adb, par-ch6.adb,
par-ch8.adb, exp_ch4.adb, sem_ch4.adb, sem_ch6.adb, par-prag.adb,
opt.ads, par-ch3.adb, lib-xref.adb: Use Ada_2012 instead of Ada_12
(Ada_Version_Type).
2010-10-11 Javier Miranda <miranda@adacore.com>
* exp_util.adb (Safe_Prefixed_Reference): If the prefix is an explicit
dereference then do not exclude dereferences of access-to-constant
types to handle them as constant view of variables (and hence remove
side effects when required).
* sem_res.adb (Resolve_Slice): Ensure that side effects in the bounds
are properly handled.
From-SVN: r165282
Diffstat (limited to 'gcc/ada/par-ch4.adb')
| -rw-r--r-- | gcc/ada/par-ch4.adb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gcc/ada/par-ch4.adb b/gcc/ada/par-ch4.adb index 10ea58f77c8..7faa02cfde5 100644 --- a/gcc/ada/par-ch4.adb +++ b/gcc/ada/par-ch4.adb @@ -235,7 +235,7 @@ package body Ch4 is -- Qualified expression in Ada 2012 mode (treated as a name) - if Ada_Version >= Ada_12 and then Token = Tok_Left_Paren then + if Ada_Version >= Ada_2012 and then Token = Tok_Left_Paren then goto Scan_Name_Extension_Apostrophe; -- If left paren not in Ada 2012, then it is not part of the name, @@ -389,7 +389,7 @@ package body Ch4 is begin -- Check for qualified expression case in Ada 2012 mode - if Ada_Version >= Ada_12 and then Token = Tok_Left_Paren then + if Ada_Version >= Ada_2012 and then Token = Tok_Left_Paren then Name_Node := P_Qualified_Expression (Name_Node); goto Scan_Name_Extension; @@ -2073,7 +2073,7 @@ package body Ch4 is -- If qualified expression, comment and continue, otherwise something -- is pretty nasty so do an Error_Resync call. - if Ada_Version < Ada_12 + if Ada_Version < Ada_2012 and then Nkind (Node1) = N_Qualified_Expression then Error_Msg_SC ("\would be legal in Ada 2012 mode"); @@ -2400,7 +2400,7 @@ package body Ch4 is -- If this looks like a conditional expression, then treat it -- that way with an error message. - elsif Ada_Version >= Ada_12 then + elsif Ada_Version >= Ada_2012 then Error_Msg_SC ("conditional expression must be parenthesized"); return P_Conditional_Expression; @@ -2426,7 +2426,7 @@ package body Ch4 is -- If this looks like a case expression, then treat it that way -- with an error message. - elsif Ada_Version >= Ada_12 then + elsif Ada_Version >= Ada_2012 then Error_Msg_SC ("case expression must be parenthesized"); return P_Case_Expression; @@ -2716,7 +2716,7 @@ package body Ch4 is Save_State : Saved_Scan_State; begin - if Ada_Version < Ada_12 then + if Ada_Version < Ada_2012 then Error_Msg_SC ("|case expression is an Ada 2012 feature"); Error_Msg_SC ("\|unit must be compiled with -gnat2012 switch"); end if; @@ -2807,7 +2807,7 @@ package body Ch4 is begin Inside_Conditional_Expression := Inside_Conditional_Expression + 1; - if Token = Tok_If and then Ada_Version < Ada_12 then + if Token = Tok_If and then Ada_Version < Ada_2012 then Error_Msg_SC ("|conditional expression is an Ada 2012 feature"); Error_Msg_SC ("\|unit must be compiled with -gnat2012 switch"); end if; @@ -2884,13 +2884,13 @@ package body Ch4 is procedure P_Membership_Test (N : Node_Id) is Alt : constant Node_Id := P_Range_Or_Subtype_Mark - (Allow_Simple_Expression => (Ada_Version >= Ada_12)); + (Allow_Simple_Expression => (Ada_Version >= Ada_2012)); begin -- Set case if Token = Tok_Vertical_Bar then - if Ada_Version < Ada_12 then + if Ada_Version < Ada_2012 then Error_Msg_SC ("set notation is an Ada 2012 feature"); Error_Msg_SC ("\|unit must be compiled with -gnat2012 switch"); end if; |