aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada/scng.adb
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2010-10-07 15:26:02 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2010-10-07 15:26:02 +0200
commitfeab35499e52bc398fd267a48e76f14b579d89b1 (patch)
tree6befc7286be463c0edb384e01b62a6c535d677de /gcc/ada/scng.adb
parentffdb3d3bfc5137dac557e64396856439784567b9 (diff)
downloadgcc-feab35499e52bc398fd267a48e76f14b579d89b1.zip
gcc-feab35499e52bc398fd267a48e76f14b579d89b1.tar.gz
gcc-feab35499e52bc398fd267a48e76f14b579d89b1.tar.bz2
[multiple changes]
2010-10-07 Robert Dewar <dewar@adacore.com> * sem_prag.adb (Analyze_Attribute_Definition_Clause, case Component_Size): Complete previous change. 2010-10-07 Vincent Celier <celier@adacore.com> * scng.adb (Scan): Call Accumulate_Token_Checksum for Tok_Identifier, even for keywords, to avoid having the checksum to depend on the Ada version. 2010-10-07 Gary Dismukes <dismukes@adacore.com> * sem_aggr.adb, sem_ch12.adb, sem_ch6.adb, par-ch5.adb, exp_ch3.adb: Minor reformatting. From-SVN: r165106
Diffstat (limited to 'gcc/ada/scng.adb')
-rw-r--r--gcc/ada/scng.adb9
1 files changed, 6 insertions, 3 deletions
diff --git a/gcc/ada/scng.adb b/gcc/ada/scng.adb
index d838445..5599d83 100644
--- a/gcc/ada/scng.adb
+++ b/gcc/ada/scng.adb
@@ -2409,6 +2409,12 @@ package body Scng is
end if;
end if;
+ -- We will assume it is an identifier, not a keyword, so that the
+ -- checksum is independent of the Ada version.
+
+ Token := Tok_Identifier;
+ Accumulate_Token_Checksum;
+
-- Here is where we check if it was a keyword
if Is_Keyword_Name (Token_Name) then
@@ -2464,14 +2470,11 @@ package body Scng is
-- corresponding keyword.
Token_Name := No_Name;
- Accumulate_Token_Checksum;
return;
-- It is an identifier after all
else
- Token := Tok_Identifier;
- Accumulate_Token_Checksum;
Post_Scan;
return;
end if;