sem_ch6.adb: Improve better error message.

2014-11-20  Ed Schonberg  <schonberg@adacore.com>

	* sem_ch6.adb: Improve better error message.

From-SVN: r217847

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index c01298c..a86d9ef 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-20  Ed Schonberg  <schonberg@adacore.com>
+
+       * sem_ch6.adb: Improve better error message.
+
 2014-11-20  Thomas Quinot  <quinot@adacore.com>
 
        * freeze.adb, sem_ch13.adb: Minor editing.

diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb
index 5a5265c..1fcde26 100644 (file)
--- a/gcc/ada/sem_ch6.adb
+++ b/gcc/ada/sem_ch6.adb
@@ -334,7 +334,8 @@ package body Sem_Ch6 is
            and then Nkind (Original_Node (Unit_Declaration_Node (Prev)))
              =  N_Expression_Function
          then
-            Error_Msg_N ("Duplicate expression function", N);
+            Error_Msg_Sloc := Sloc (Prev);
+            Error_Msg_N ("& conflicts with declaration#", Def_Id);
             return;
          end if;
       end if;