vhdl: move xrefs to vhdl child package.

13 files changed, 26 insertions, 26 deletions

diff --git a/src/ghdldrv/ghdlprint.adb b/src/ghdldrv/ghdlprint.adb
index 400cfaaec..1795a39f6 100644
--- a/src/ghdldrv/ghdlprint.adb
+++ b/src/ghdldrv/ghdlprint.adb
@@ -32,7 +32,7 @@ with Vhdl.Scanner;
 with Vhdl.Parse;
 with Vhdl.Canon;
 with Version;
-with Xrefs;
+with Vhdl.Xrefs;
 with Vhdl.Sem_Lib; use Vhdl.Sem_Lib;
 with Ghdlmain; use Ghdlmain;
 with Ghdllocal; use Ghdllocal;
@@ -229,7 +229,7 @@ package body Ghdlprint is
 
       procedure Disp_Identifier
       is
-         use Xrefs;
+         use Vhdl.Xrefs;
          Ref : Xref;
          Decl : Iir;
          Bod : Iir;
@@ -311,7 +311,7 @@ package body Ghdlprint is
 
       procedure Disp_Attribute
       is
-         use Xrefs;
+         use Vhdl.Xrefs;
          Ref : Xref;
          Decl : Iir;
          Loc : Location_Type;
@@ -1315,7 +1315,7 @@ package body Ghdlprint is
       Files : File_Data_Array;
       Output : File_Type;
    begin
-      Xrefs.Init;
+      Vhdl.Xrefs.Init;
       Flags.Flag_Xref := True;
 
       --  Load work library.
@@ -1369,13 +1369,13 @@ package body Ghdlprint is
          Analyze_Design_File_Units (Files (I).Design_File);
       end loop;
 
-      Xrefs.Sort_By_Location;
+      Vhdl.Xrefs.Sort_By_Location;
 
       if False then
          --  Dump locations
-         for I in 1 .. Xrefs.Get_Last_Xref loop
+         for I in 1 .. Vhdl.Xrefs.Get_Last_Xref loop
             declare
-               use Xrefs;
+               use Vhdl.Xrefs;
 
                procedure Put_Loc (L : Location_Type)
                is
@@ -1571,7 +1571,7 @@ package body Ghdlprint is
       --  Load work library.
       Setup_Libraries (True);
 
-      Xrefs.Init;
+      Vhdl.Xrefs.Init;
       Flags.Flag_Xref := True;
 
       --  Parse all files.
@@ -1597,15 +1597,15 @@ package body Ghdlprint is
          Analyze_Design_File_Units (Files (I).Design_File);
       end loop;
 
-      Xrefs.Fix_End_Xrefs;
-      Xrefs.Sort_By_Node_Location;
+      Vhdl.Xrefs.Fix_End_Xrefs;
+      Vhdl.Xrefs.Sort_By_Node_Location;
 
       for F in Files'Range loop
 
          Put ("GHDL-XREF V0");
 
          declare
-            use Xrefs;
+            use Vhdl.Xrefs;
 
             Cur_Decl : Iir;
             Cur_File : Source_File_Entry;
diff --git a/src/vhdl/vhdl-parse.adb b/src/vhdl/vhdl-parse.adb
index 4c39d91bb..ac1fa7b94 100644
--- a/src/vhdl/vhdl-parse.adb
+++ b/src/vhdl/vhdl-parse.adb
@@ -24,7 +24,7 @@ with Std_Names; use Std_Names;
 with Flags; use Flags;
 with Vhdl.Parse_Psl;
 with Str_Table;
-with Xrefs;
+with Vhdl.Xrefs;
 with Vhdl.Elocations; use Vhdl.Elocations;
 
 --  Recursive descendant parser.
diff --git a/src/vhdl/vhdl-sem.adb b/src/vhdl/vhdl-sem.adb
index 0af9db861..8cc7f934f 100644
--- a/src/vhdl/vhdl-sem.adb
+++ b/src/vhdl/vhdl-sem.adb
@@ -34,7 +34,7 @@ with Str_Table;
 with Vhdl.Sem_Utils;
 with Vhdl.Sem_Stmts; use Vhdl.Sem_Stmts;
 with Iir_Chains;
-with Xrefs; use Xrefs;
+with Vhdl.Xrefs; use Vhdl.Xrefs;
 
 package body Vhdl.Sem is
    -- Forward declarations.
diff --git a/src/vhdl/vhdl-sem_assocs.adb b/src/vhdl/vhdl-sem_assocs.adb
index 112ed5e2f..b56692a40 100644
--- a/src/vhdl/vhdl-sem_assocs.adb
+++ b/src/vhdl/vhdl-sem_assocs.adb
@@ -28,7 +28,7 @@ with Vhdl.Sem_Decls;
 with Vhdl.Std_Package;
 with Vhdl.Sem_Scopes;
 with Iir_Chains; use Iir_Chains;
-with Xrefs;
+with Vhdl.Xrefs;
 
 package body Vhdl.Sem_Assocs is
    function Rewrite_Non_Object_Association (Assoc : Iir; Inter : Iir)
@@ -1773,7 +1773,7 @@ package body Vhdl.Sem_Assocs is
       end case;
 
       Set_Named_Entity (Actual, Res);
-      Xrefs.Xref_Name (Actual);
+      Vhdl.Xrefs.Xref_Name (Actual);
       Sem_Decls.Mark_Subprogram_Used (Res);
    end Sem_Association_Subprogram;
 
diff --git a/src/vhdl/vhdl-sem_decls.adb b/src/vhdl/vhdl-sem_decls.adb
index 21eefd8ae..24d07d77f 100644
--- a/src/vhdl/vhdl-sem_decls.adb
+++ b/src/vhdl/vhdl-sem_decls.adb
@@ -32,7 +32,7 @@ with Vhdl.Sem_Specs; use Vhdl.Sem_Specs;
 with Vhdl.Sem_Types; use Vhdl.Sem_Types;
 with Vhdl.Sem_Psl;
 with Vhdl.Sem_Inst;
-with Xrefs; use Xrefs;
+with Vhdl.Xrefs; use Vhdl.Xrefs;
 
 package body Vhdl.Sem_Decls is
    --  Region that can declare signals.  Used to add implicit declarations.
diff --git a/src/vhdl/vhdl-sem_expr.adb b/src/vhdl/vhdl-sem_expr.adb
index 5fa584758..91ff0b950 100644
--- a/src/vhdl/vhdl-sem_expr.adb
+++ b/src/vhdl/vhdl-sem_expr.adb
@@ -32,7 +32,7 @@ with Vhdl.Sem_Types;
 with Vhdl.Sem_Stmts; use Vhdl.Sem_Stmts;
 with Vhdl.Sem_Assocs; use Vhdl.Sem_Assocs;
 with Vhdl.Sem_Decls;
-with Xrefs; use Xrefs;
+with Vhdl.Xrefs; use Vhdl.Xrefs;
 
 package body Vhdl.Sem_Expr is
 
diff --git a/src/vhdl/vhdl-sem_names.adb b/src/vhdl/vhdl-sem_names.adb
index afb0b549b..85986cb78 100644
--- a/src/vhdl/vhdl-sem_names.adb
+++ b/src/vhdl/vhdl-sem_names.adb
@@ -34,7 +34,7 @@ with Vhdl.Sem_Assocs; use Vhdl.Sem_Assocs;
 with Vhdl.Sem_Specs;
 with Vhdl.Sem_Types;
 with Vhdl.Sem_Psl;
-with Xrefs; use Xrefs;
+with Vhdl.Xrefs; use Vhdl.Xrefs;
 
 package body Vhdl.Sem_Names is
    --  Finish the analyze of NAME using RES as named entity.
diff --git a/src/vhdl/vhdl-sem_psl.adb b/src/vhdl/vhdl-sem_psl.adb
index a9ca225b2..5d782ed40 100644
--- a/src/vhdl/vhdl-sem_psl.adb
+++ b/src/vhdl/vhdl-sem_psl.adb
@@ -31,7 +31,7 @@ with Vhdl.Evaluation; use Vhdl.Evaluation;
 with Vhdl.Std_Package;
 with Vhdl.Ieee.Std_Logic_1164;
 with Errorout; use Errorout;
-with Xrefs; use Xrefs;
+with Vhdl.Xrefs; use Vhdl.Xrefs;
 
 package body Vhdl.Sem_Psl is
    procedure Sem_Psl_Directive_Clock (Stmt : Iir; Prop : in out Node);
diff --git a/src/vhdl/vhdl-sem_specs.adb b/src/vhdl/vhdl-sem_specs.adb
index aa535017a..5d3224ed0 100644
--- a/src/vhdl/vhdl-sem_specs.adb
+++ b/src/vhdl/vhdl-sem_specs.adb
@@ -30,7 +30,7 @@ with Iir_Chains; use Iir_Chains;
 with Flags; use Flags;
 with Std_Names;
 with Vhdl.Sem_Decls;
-with Xrefs; use Xrefs;
+with Vhdl.Xrefs; use Vhdl.Xrefs;
 with Vhdl.Back_End;
 
 package body Vhdl.Sem_Specs is
diff --git a/src/vhdl/vhdl-sem_stmts.adb b/src/vhdl/vhdl-sem_stmts.adb
index deca231a6..9553dc7df 100644
--- a/src/vhdl/vhdl-sem_stmts.adb
+++ b/src/vhdl/vhdl-sem_stmts.adb
@@ -30,7 +30,7 @@ with Vhdl.Sem_Psl;
 with Std_Names;
 with Vhdl.Evaluation; use Vhdl.Evaluation;
 with Iirs_Utils; use Iirs_Utils;
-with Xrefs; use Xrefs;
+with Vhdl.Xrefs; use Vhdl.Xrefs;
 
 package body Vhdl.Sem_Stmts is
    -- Process is the scope, this is also the process for which drivers can
diff --git a/src/vhdl/vhdl-sem_types.adb b/src/vhdl/vhdl-sem_types.adb
index 3eb5e8fe1..1769bdbfc 100644
--- a/src/vhdl/vhdl-sem_types.adb
+++ b/src/vhdl/vhdl-sem_types.adb
@@ -31,7 +31,7 @@ with Std_Names;
 with Iirs_Utils; use Iirs_Utils;
 with Vhdl.Std_Package; use Vhdl.Std_Package;
 with Vhdl.Ieee.Std_Logic_1164;
-with Xrefs; use Xrefs;
+with Vhdl.Xrefs; use Vhdl.Xrefs;
 
 package body Vhdl.Sem_Types is
    --  Mark the resolution function (this may be required by the back-end to
diff --git a/src/vhdl/xrefs.adb b/src/vhdl/vhdl-xrefs.adb
index 0c510892b..021acd485 100644
--- a/src/vhdl/xrefs.adb
+++ b/src/vhdl/vhdl-xrefs.adb
@@ -22,7 +22,7 @@ with Vhdl.Std_Package;
 with Errorout; use Errorout;
 with Vhdl.Nodes_Priv;
 
-package body Xrefs is
+package body Vhdl.Xrefs is
    type Xref_Type is record
       --  Where the cross-reference (or the name) appears.
       Loc : Location_Type;
@@ -282,4 +282,4 @@ package body Xrefs is
          end if;
       end loop;
    end Fix_End_Xrefs;
-end Xrefs;
+end Vhdl.Xrefs;
diff --git a/src/vhdl/xrefs.ads b/src/vhdl/vhdl-xrefs.ads
index 766d123c1..da990f090 100644
--- a/src/vhdl/xrefs.ads
+++ b/src/vhdl/vhdl-xrefs.ads
@@ -18,7 +18,7 @@
 with Types; use Types;
 with Vhdl.Nodes; use Vhdl.Nodes;
 
-package Xrefs is
+package Vhdl.Xrefs is
    type Xref_Kind is
      (
       --  Declaration of an identifier.
@@ -112,4 +112,4 @@ package Xrefs is
    --  Get the node referenced by the name.
    function Get_Xref_Node (N : Xref) return Iir;
    pragma Inline (Get_Xref_Node);
-end Xrefs;
+end Vhdl.Xrefs;