From: Arnaud Charlet <charlet@gcc.gnu.org>
Date: Tue, 22 Jun 2010 12:11:53 +0000 (+0200)
Subject: [multiple changes]
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3b6d290a25c33ef16565cdd15b08bfd9d8ac527c;p=gcc.git

[multiple changes]

2010-06-22  Vincent Celier  <celier@adacore.com>

	* prj-nmsc.adb (Process_Naming_Scheme): Initialize table Lib_Data_Table.

2010-06-22  Robert Dewar  <dewar@adacore.com>

	* par-ch4.adb (P_Name): Recognize 'Mod attribute in Ada 95 mode
	* sem_attr.adb (Attribute_05): Add Name_Mod so that 'Mod recognized in
	Ada 95 mode as an implementation defined attribute.

From-SVN: r161166
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index df1bc715f5d..30eac7fbb1d 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,13 @@
+2010-06-22  Vincent Celier  <celier@adacore.com>
+
+	* prj-nmsc.adb (Process_Naming_Scheme): Initialize table Lib_Data_Table.
+
+2010-06-22  Robert Dewar  <dewar@adacore.com>
+
+	* par-ch4.adb (P_Name): Recognize 'Mod attribute in Ada 95 mode
+	* sem_attr.adb (Attribute_05): Add Name_Mod so that 'Mod recognized in
+	Ada 95 mode as an implementation defined attribute.
+
 2010-06-22  Vincent Celier  <celier@adacore.com>
 
 	* bindusg.adb (Display): Update line for -R
diff --git a/gcc/ada/par-ch4.adb b/gcc/ada/par-ch4.adb
index 7b1b87c1ce6..6f3a2f28ed6 100644
--- a/gcc/ada/par-ch4.adb
+++ b/gcc/ada/par-ch4.adb
@@ -437,7 +437,7 @@ package body Ch4 is
                elsif Token = Tok_Access then
                   Attr_Name := Name_Access;
 
-               elsif Token = Tok_Mod and then Ada_Version = Ada_05 then
+               elsif Token = Tok_Mod and then Ada_Version >= Ada_95 then
                   Attr_Name := Name_Mod;
 
                elsif Apostrophe_Should_Be_Semicolon then
diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb
index f16f6e7bd9b..6ea1daffe32 100644
--- a/gcc/ada/prj-nmsc.adb
+++ b/gcc/ada/prj-nmsc.adb
@@ -165,7 +165,7 @@ package body Prj.Nmsc is
 
    package Lib_Data_Table is new GNAT.Table
      (Table_Component_Type => Lib_Data,
-      Table_Index_Type     => Positive,
+      Table_Index_Type     => Natural,
       Table_Low_Bound      => 1,
       Table_Initial        => 10,
       Table_Increment      => 100);
@@ -7567,6 +7567,7 @@ package body Prj.Nmsc is
 
    --  Start of processing for Process_Naming_Scheme
    begin
+      Lib_Data_Table.Init;
       Initialize (Data, Tree => Tree, Flags => Flags);
       Check_All_Projects (Root_Project, Data, Imported_First => True);
       Free (Data);
diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb
index a3dfdf0b498..9d1589afa01 100644
--- a/gcc/ada/sem_attr.adb
+++ b/gcc/ada/sem_attr.adb
@@ -136,6 +136,7 @@ package body Sem_Attr is
 
    Attribute_05 : constant Attribute_Class_Array := Attribute_Class_Array'(
       Attribute_Machine_Rounding  |
+      Attribute_Mod               |
       Attribute_Priority          |
       Attribute_Stream_Size       |
       Attribute_Wide_Wide_Width   => True,