[multiple changes]

2017-11-08  Piotr Trojanek  <trojanek@adacore.com>

	* spark_xrefs.ads (SPARK_Scope_Record): Remove File_Num component.
	* lib-xref-spark_specific.adb (Add_SPARK_Scope): Skip initialization of
	removed component.

2017-11-08  Gary Dismukes  <dismukes@adacore.com>

	* sem_ch4.adb: Minor typo fix.

From-SVN: r254546

gcc/ada/ChangeLog

 2017-11-08  Piotr Trojanek  <trojanek@adacore.com>
 
+	* spark_xrefs.ads (SPARK_Scope_Record): Remove File_Num component.
+	* lib-xref-spark_specific.adb (Add_SPARK_Scope): Skip initialization of
+	removed component.
+
+2017-11-08  Gary Dismukes  <dismukes@adacore.com>
+
+	* sem_ch4.adb: Minor typo fix.
+
+2017-11-08  Piotr Trojanek  <trojanek@adacore.com>
+
 	* spark_xrefs.ads (SPARK_Scope_Record): Remove Spec_File_Num and
 	Spec_Scope_Num components.
 	* spark_xrefs.adb (dspark): Skip pretty-printing to removed components.

gcc/ada/lib-xref-spark_specific.adb

@@ -161,11 +161,10 @@ package body SPARK_Specific is
          --  range.
 
          SPARK_Scope_Table.Append
-           ((Entity         => E,
-             File_Num       => Dspec,
-             Scope_Num      => Scope_Id,
-             From_Xref      => 1,
-             To_Xref        => 0));
+           ((Entity    => E,
+             Scope_Num => Scope_Id,
+             From_Xref => 1,
+             To_Xref   => 0));
 
          Scope_Id := Scope_Id + 1;
       end Add_SPARK_Scope;

gcc/ada/sem_ch4.adb

@@ -418,7 +418,7 @@ package body Sem_Ch4 is
    --  Delta aggregates have a base component that determines the type of the
    --  enclosing aggregate so its type can be ascertained earlier. This also
    --  allows delta aggregates to appear in the context of a record type with
-   --  a private extension, as per the latest update of AI2-0127.
+   --  a private extension, as per the latest update of AI12-0127.
 
    procedure Analyze_Aggregate (N : Node_Id) is
    begin

gcc/ada/spark_xrefs.ads

@@ -104,11 +104,8 @@ package SPARK_Xrefs is
       Entity : Entity_Id;
       --  Entity that is represented by the scope
 
-      File_Num : Nat;
-      --  Set to the file dependency number for the scope
-
       Scope_Num : Pos;
-      --  Set to the scope number for the scope
+      --  Set to the scope number within the enclosing unit
 
       From_Xref : Xref_Index;
       --  Starting index in Xref table for this scope