From 2cf8eabd48500b8d2480301020bd2aa82cf6556d Mon Sep 17 00:00:00 2001 From: Pierre-Marie de Rodat Date: Wed, 8 Nov 2017 16:31:39 +0000 Subject: [multiple changes] 2017-11-08 Piotr Trojanek * spark_xrefs.ads (SPARK_Xref_Record): Replace file and scope indices with Entity_Id of the reference. * spark_xrefs.adb (dspark): Adapt pretty-printing routine. * lib-xref-spark_specific.adb (Add_SPARK_Xrefs): Store Entity_Id of the reference, not the file and scope indices. 2017-11-08 Arnaud Charlet * errout.ads (Current_Node): New. * errout.adb (Error_Msg): Use Current_Node. * par-ch6.adb, par-ch7.adb, par-ch9.adb, par-util.adb: Set Current_Node when relevant. * style.adb: Call Error_Msg_N when possible. From-SVN: r254543 --- gcc/ada/spark_xrefs.adb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gcc/ada/spark_xrefs.adb') diff --git a/gcc/ada/spark_xrefs.adb b/gcc/ada/spark_xrefs.adb index 6c7dc0c..48b8b58 100644 --- a/gcc/ada/spark_xrefs.adb +++ b/gcc/ada/spark_xrefs.adb @@ -104,10 +104,9 @@ package body SPARK_Xrefs is Write_Str (Unique_Name (AXR.Entity)); Write_Char ('"'); - Write_Str (" File_Num = "); - Write_Int (Int (AXR.File_Num)); - Write_Str (" Scope_Num = "); - Write_Int (Int (AXR.Scope_Num)); + Write_Str (" Reference_Scope = "); + Write_Str (Unique_Name (AXR.Ref_Scope)); + Write_Char ('"'); Write_Str (" Type = "); Write_Char (AXR.Rtype); Write_Eol; -- cgit v1.1