diff options
| author | Piotr Trojanek <trojanek@adacore.com> | 2017-11-08 16:25:03 +0000 |
|---|---|---|
| committer | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2017-11-08 16:25:03 +0000 |
| commit | 45a6947d0f40ca6bfebd430969087e0595c47cb8 (patch) | |
| tree | f9f53f4e847c46d6ec4177d393c7bf8d0c6b62a8 | |
| parent | 00b3de222b3bc8eff6fb95219d7aa963b7fd277d (diff) | |
| download | gcc-45a6947d0f40ca6bfebd430969087e0595c47cb8.zip gcc-45a6947d0f40ca6bfebd430969087e0595c47cb8.tar.gz gcc-45a6947d0f40ca6bfebd430969087e0595c47cb8.tar.bz2 | |
spark_xrefs.ads (SPARK_Scope_Record): Rename Scope_Id component to Entity.
2017-11-08 Piotr Trojanek <trojanek@adacore.com>
* spark_xrefs.ads (SPARK_Scope_Record): Rename Scope_Id component to
Entity.
* lib-xref-spark_specific.adb, spark_xrefs.adb: Propagate renaming of
the Scope_Id record component.
From-SVN: r254542
| -rw-r--r-- | gcc/ada/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/ada/lib-xref-spark_specific.adb | 16 | ||||
| -rw-r--r-- | gcc/ada/spark_xrefs.adb | 2 | ||||
| -rw-r--r-- | gcc/ada/spark_xrefs.ads | 4 |
4 files changed, 18 insertions, 11 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 2e5c0c4..1fb9feb 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,12 @@ 2017-11-08 Piotr Trojanek <trojanek@adacore.com> + * spark_xrefs.ads (SPARK_Scope_Record): Rename Scope_Id component to + Entity. + * lib-xref-spark_specific.adb, spark_xrefs.adb: Propagate renaming of + the Scope_Id record component. + +2017-11-08 Piotr Trojanek <trojanek@adacore.com> + * spark_xrefs.ads (SPARK_File_Record): Remove string components. * spark_xrefs.adb (dspark): Remove pretty-printing of removed SPARK_File_Record components. diff --git a/gcc/ada/lib-xref-spark_specific.adb b/gcc/ada/lib-xref-spark_specific.adb index 300706a..929de9a 100644 --- a/gcc/ada/lib-xref-spark_specific.adb +++ b/gcc/ada/lib-xref-spark_specific.adb @@ -161,7 +161,7 @@ package body SPARK_Specific is -- range. SPARK_Scope_Table.Append - ((Scope_Id => E, + ((Entity => E, File_Num => Dspec, Scope_Num => Scope_Id, Spec_File_Num => 0, @@ -323,7 +323,7 @@ package body SPARK_Specific is function Entity_Of_Scope (S : Scope_Index) return Entity_Id is begin - return SPARK_Scope_Table.Table (S).Scope_Id; + return SPARK_Scope_Table.Table (S).Entity; end Entity_Of_Scope; ------------------- @@ -395,7 +395,7 @@ package body SPARK_Specific is function Is_Past_Scope_Entity return Boolean is begin for Index in SPARK_Scope_Table.First .. S - 1 loop - if SPARK_Scope_Table.Table (Index).Scope_Id = E then + if SPARK_Scope_Table.Table (Index).Entity = E then return True; end if; end loop; @@ -407,7 +407,7 @@ package body SPARK_Specific is begin for Index in S .. SPARK_Scope_Table.Last loop - if SPARK_Scope_Table.Table (Index).Scope_Id = E then + if SPARK_Scope_Table.Table (Index).Entity = E then return True; end if; end loop; @@ -606,7 +606,7 @@ package body SPARK_Specific is declare S : SPARK_Scope_Record renames SPARK_Scope_Table.Table (Index); begin - Set_Scope_Num (S.Scope_Id, S.Scope_Num); + Set_Scope_Num (S.Entity, S.Scope_Num); end; end loop; @@ -920,7 +920,7 @@ package body SPARK_Specific is declare Srec : SPARK_Scope_Record renames SPARK_Scope_Table.Table (S); begin - Entity_Hash_Table.Set (Srec.Scope_Id, S); + Entity_Hash_Table.Set (Srec.Entity, S); end; end loop; @@ -931,14 +931,14 @@ package body SPARK_Specific is Srec : SPARK_Scope_Record renames SPARK_Scope_Table.Table (S); Spec_Entity : constant Entity_Id := - Unique_Entity (Srec.Scope_Id); + Unique_Entity (Srec.Entity); Spec_Scope : constant Scope_Index := Entity_Hash_Table.Get (Spec_Entity); begin -- Generic spec may be missing in which case Spec_Scope is zero - if Spec_Entity /= Srec.Scope_Id + if Spec_Entity /= Srec.Entity and then Spec_Scope /= 0 then Srec.Spec_File_Num := diff --git a/gcc/ada/spark_xrefs.adb b/gcc/ada/spark_xrefs.adb index 9461c96..6c7dc0c 100644 --- a/gcc/ada/spark_xrefs.adb +++ b/gcc/ada/spark_xrefs.adb @@ -75,7 +75,7 @@ package body SPARK_Xrefs is Write_Int (Int (ASR.Scope_Num)); Write_Str (" Scope_Name = """); - Write_Str (Unique_Name (ASR.Scope_Id)); + Write_Str (Unique_Name (ASR.Entity)); Write_Char ('"'); Write_Str (" From = "); diff --git a/gcc/ada/spark_xrefs.ads b/gcc/ada/spark_xrefs.ads index 7ac0901..c5604fd 100644 --- a/gcc/ada/spark_xrefs.ads +++ b/gcc/ada/spark_xrefs.ads @@ -109,8 +109,8 @@ package SPARK_Xrefs is -- determined. type SPARK_Scope_Record is record - Scope_Id : Entity_Id; - -- Pointer to scope name in ALI file + Entity : Entity_Id; + -- Entity that is represented by the scope File_Num : Nat; -- Set to the file dependency number for the scope |