[multiple changes]

2010-10-11  Ed Schonberg  <schonberg@adacore.com>

	* sem_res.adb (Resolve_Entry_Call): Generate 's' reference for entry
	call.
	* sem_ch6.adb: Diagnose additional error condition.

2010-10-11  Bob Duff  <duff@adacore.com>

	* par.adb (Par): Clarify wording of certain error messages.

From-SVN: r165286

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 0d2b6be..156adc6 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-11  Ed Schonberg  <schonberg@adacore.com>
+
+       * sem_res.adb (Resolve_Entry_Call): Generate 's' reference for entry
+       call.
+       * sem_ch6.adb: Diagnose additional error condition.
+
+2010-10-11  Bob Duff  <duff@adacore.com>
+
+       * par.adb (Par): Clarify wording of certain error messages.
+
 2010-10-11  Gary Dismukes  <dismukes@adacore.com>
 
        * sem_disp.adb (Check_Dispatching_Operation): Revise test for warning

diff --git a/gcc/ada/par.adb b/gcc/ada/par.adb
index 7ba6e0c..b8a95a6 100644 (file)
--- a/gcc/ada/par.adb
+++ b/gcc/ada/par.adb
@@ -1375,7 +1375,7 @@ begin
 
             begin
                --  If parsing was successful and we are not in check syntax
-               --  mode, check that language defined units are compiled in GNAT
+               --  mode, check that language-defined units are compiled in GNAT
                --  mode. For this purpose we do NOT consider renamings in annex
                --  J as predefined. That allows users to compile their own
                --  versions of these files, and in particular, in the VMS
@@ -1406,7 +1406,7 @@ begin
                         Name = "system"
                      then
                         Error_Msg
-                          ("language defined units may not be recompiled",
+                          ("language-defined units cannot be recompiled",
                            Sloc (Unit (Comp_Unit_Node)));
 
                      elsif Name'Length > 4
@@ -1414,8 +1414,8 @@ begin
                          Name (Name'First .. Name'First + 3) = "ada."
                      then
                         Error_Msg
-                          ("descendents of package Ada " &
-                             "may not be compiled",
+                          ("user-defined descendents of package Ada " &
+                             "are not allowed",
                            Sloc (Unit (Comp_Unit_Node)));
 
                      elsif Name'Length > 11
@@ -1423,8 +1423,8 @@ begin
                          Name (Name'First .. Name'First + 10) = "interfaces."
                      then
                         Error_Msg
-                          ("descendents of package Interfaces " &
-                             "may not be compiled",
+                          ("user-defined descendents of package Interfaces " &
+                             "are not allowed",
                            Sloc (Unit (Comp_Unit_Node)));
 
                      elsif Name'Length > 7
@@ -1436,8 +1436,8 @@ begin
                                                                  "system.rpc.")
                      then
                         Error_Msg
-                          ("descendents of package System " &
-                             "may not be compiled",
+                          ("user-defined descendents of package System " &
+                             "are not allowed",
                            Sloc (Unit (Comp_Unit_Node)));
                      end if;
                   end;

diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb
index 12635f4..7c79042 100644 (file)
--- a/gcc/ada/sem_ch6.adb
+++ b/gcc/ada/sem_ch6.adb
@@ -5915,7 +5915,11 @@ package body Sem_Ch6 is
                null;
 
             elsif In_Package_Body (Scope (Typ)) then
-               null;   --  warrants a warning ???
+               Error_Msg_NE
+                 ("equality operator must be declared "
+                   & "before type& is frozen", Eq_Op, Typ);
+               Error_Msg_N
+                 ("\move declaration to package spec", Eq_Op);
 
             else
                Error_Msg_NE

diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb
index 7245b0b..3cd4c76 100644 (file)
--- a/gcc/ada/sem_res.adb
+++ b/gcc/ada/sem_res.adb
@@ -6328,7 +6328,10 @@ package body Sem_Res is
       end if;
 
       Resolve_Actuals (N, Nam);
-      Generate_Reference (Nam, Entry_Name);
+
+      --  Create a call reference to the entry
+
+      Generate_Reference (Nam, Entry_Name, 's');
 
       if Ekind_In (Nam, E_Entry, E_Entry_Family) then
          Check_Potentially_Blocking_Operation (N);