diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2014-01-24 15:47:12 +0100 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2014-01-24 15:47:12 +0100 |
| commit | d0ef7921074e2de8f6d4f96b9973ed32e63c0060 (patch) | |
| tree | 43cae609c633bc42287b42a5bbe2fef41a7a770b /gcc/ada/scans.ads | |
| parent | 162c21d9985ea765ff74de0a465a6119363f1dcd (diff) | |
| download | gcc-d0ef7921074e2de8f6d4f96b9973ed32e63c0060.zip gcc-d0ef7921074e2de8f6d4f96b9973ed32e63c0060.tar.gz gcc-d0ef7921074e2de8f6d4f96b9973ed32e63c0060.tar.bz2 | |
[multiple changes]
2014-01-24 Robert Dewar <dewar@adacore.com>
* exp_ch7.adb: Minor change of Indices to Indexes (preferred
terminology in compiler).
2014-01-24 Robert Dewar <dewar@adacore.com>
* scans.ads: Remove Tok_Raise from Sterm, Eterm, After_SM
categories, now that Ada 95 supports raise expressions.
2014-01-24 Robert Dewar <dewar@adacore.com>
* freeze.adb (Freeze_Enumeration_Type): Use new target parameter
Short_Enums_On_Target.
* sem_ch13.adb (Set_Enum_Esize): Take Short_Enums_On_Target
into account.
* targparm.ads, targparm.adb: Add new target parameter Short_Enums.
2014-01-24 Ed Schonberg <schonberg@adacore.com>
* sem_ch5.adb (Analyze_Iterator_Specification): If subtype
indication is given explicity, check that it matches the array
component type or the container element type of the domain
of iteration.
2014-01-24 Tristan Gingold <gingold@adacore.com>
* back_end.adb (Scan_Compiler_Arguments): Set Short_Enums_On_Target.
2014-01-24 Vincent Celier <celier@adacore.com>
* prj-env.adb (Ada_Objects_Path): Use Ada_Objects_Path_No_Libs
to cache the result when Including_Libraries is False.
* prj-env.ads (Ada_Objects_Path): Update documentation
* prj.adb (Free (Project_Id)): Also free Ada_Objects_Path_No_Libs
(Get_Object_Directory): Return the Library_Ali_Dir only when
when Including_Libraries is True.
* prj.ads (Get_Object_Directory): Fix and complete documentation
(Project_Data): New component Ada_Objects_Path_No_Libs
From-SVN: r207036
Diffstat (limited to 'gcc/ada/scans.ads')
| -rw-r--r-- | gcc/ada/scans.ads | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gcc/ada/scans.ads b/gcc/ada/scans.ads index c0e589d..ff05953 100644 --- a/gcc/ada/scans.ads +++ b/gcc/ada/scans.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2012, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2013, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -82,6 +82,15 @@ package Scans is Tok_Others, -- OTHERS Tok_Null, -- NULL + -- Note: Tok_Raise is in no categories now, it used to be Cterm, Eterm, + -- After_SM, but now that Ada 2012 has added raise expressions, the + -- raise token can appear anywhere. Note in particular that Tok_Raise + -- being in Eterm stopped the parser from recognizing "return raise + -- exception-name". This degrades error recovery slightly, and perhaps + -- we could do better, but not worth the effort. + + Tok_Raise, -- RAISE + Tok_Dot, -- . Namext Tok_Apostrophe, -- ' Namext @@ -148,7 +157,6 @@ package Scans is Tok_Goto, -- GOTO Eterm, Sterm, After_SM Tok_If, -- IF Eterm, Sterm, After_SM Tok_Pragma, -- PRAGMA Eterm, Sterm, After_SM - Tok_Raise, -- RAISE Eterm, Sterm, After_SM Tok_Requeue, -- REQUEUE Eterm, Sterm, After_SM Tok_Return, -- RETURN Eterm, Sterm, After_SM Tok_Select, -- SELECT Eterm, Sterm, After_SM |