vhdl: move elocations* packages to vhdl children.

10 files changed, 29 insertions, 28 deletions

diff --git a/src/ghdldrv/ghdlprint.adb b/src/ghdldrv/ghdlprint.adb
index 90a387d8a..400cfaaec 100644
--- a/src/ghdldrv/ghdlprint.adb
+++ b/src/ghdldrv/ghdlprint.adb
@@ -37,7 +37,7 @@ with Vhdl.Sem_Lib; use Vhdl.Sem_Lib;
 with Ghdlmain; use Ghdlmain;
 with Ghdllocal; use Ghdllocal;
 with Vhdl.Disp_Vhdl;
-with Elocations;
+with Vhdl.Elocations;
 
 package body Ghdlprint is
    type Html_Format_Type is (Html_2, Html_Css);
@@ -754,7 +754,7 @@ package body Ghdlprint is
                Lib := Get_Library_Unit (Unit);
 
                Location_To_File_Pos
-                 (Elocations.Get_End_Location (Lib), File_Entry, Lend);
+                 (Vhdl.Elocations.Get_End_Location (Lib), File_Entry, Lend);
                if Lend < First then
                   raise Internal_Error;
                end if;
diff --git a/src/vhdl/Makefile b/src/vhdl/Makefile
index 2ff18046f..a18d334c6 100644
--- a/src/vhdl/Makefile
+++ b/src/vhdl/Makefile
@@ -26,13 +26,14 @@ PNODESPY=python/pnodespy.py
 DEPS=iirs.ads nodes.ads $(PNODES)
 
 GEN_FILES=iirs.adb nodes_meta.ads nodes_meta.adb \
-  elocations.adb elocations_meta.ads elocations_meta.adb \
+  vhdl-elocations.adb vhdl-elocations_meta.ads vhdl-elocations_meta.adb \
   python/libghdl/iirs.py python/libghdl/nodes_meta.py \
   python/libghdl/std_names.py python/libghdl/tokens.py \
   python/libghdl/elocations.py python/libghdl/errorout.py
 
-ELOCATIONS_FLAGS=--node-file=elocations.ads --field-file=elocations.adb.in \
-  --template-file=elocations.adb.in --meta-basename=elocations_meta
+ELOCATIONS_FLAGS=--node-file=vhdl-elocations.ads \
+  --field-file=vhdl-elocations.adb.in \
+  --template-file=vhdl-elocations.adb.in --meta-basename=vhdl-elocations_meta
 
 all: $(GEN_FILES)
 
@@ -51,17 +52,17 @@ nodes_meta.adb: nodes_meta.adb.in $(DEPS)
 	$(PNODES) meta_body > $@
 	chmod -w $@
 
-elocations.adb: elocations.adb.in elocations.ads $(DEPS)
+vhdl-elocations.adb: vhdl-elocations.adb.in vhdl-elocations.ads $(DEPS)
 	$(RM) $@
 	$(PNODES) $(ELOCATIONS_FLAGS) body > $@
 	chmod -w $@
 
-elocations_meta.ads: elocations_meta.ads.in elocations.ads $(DEPS)
+vhdl-elocations_meta.ads: vhdl-elocations_meta.ads.in vhdl-elocations.ads $(DEPS)
 	$(RM) $@
 	$(PNODES) $(ELOCATIONS_FLAGS) meta_specs > $@
 	chmod -w $@
 
-elocations_meta.adb: elocations_meta.adb.in elocations.ads $(DEPS)
+vhdl-elocations_meta.adb: vhdl-elocations_meta.adb.in vhdl-elocations.ads $(DEPS)
 	$(RM) $@
 	$(PNODES) $(ELOCATIONS_FLAGS) meta_body > $@
 	chmod -w $@
@@ -86,7 +87,7 @@ python/libghdl/tokens.py: $(PNODESPY) vhdl-tokens.ads
 	$(PNODESPY) libghdl-tokens > $@
 	chmod -w $@
 
-python/libghdl/elocations.py: $(PNODESPY) elocations.ads
+python/libghdl/elocations.py: $(PNODESPY) vhdl-elocations.ads
 	$(RM) $@
 	$(PNODESPY) $(ELOCATIONS_FLAGS) libghdl-elocs > $@
 	chmod -w $@
diff --git a/src/vhdl/elocations.adb b/src/vhdl/vhdl-elocations.adb
index 9ba4f8325..50e775146 100644
--- a/src/vhdl/elocations.adb
+++ b/src/vhdl/vhdl-elocations.adb
@@ -18,9 +18,9 @@
 
 with Tables;
 with Nodes;
-with Elocations_Meta; use Elocations_Meta;
+with Vhdl.Elocations_Meta; use Vhdl.Elocations_Meta;
 
-package body Elocations is
+package body Vhdl.Elocations is
 
    --  Format of a node.
    type Format_Type is
@@ -707,4 +707,4 @@ package body Elocations is
       Set_Field3 (N, Loc);
    end Set_Assign_Location;
 
-end Elocations;
+end Vhdl.Elocations;
diff --git a/src/vhdl/elocations.adb.in b/src/vhdl/vhdl-elocations.adb.in
index 95a73dd54..1e2827b5f 100644
--- a/src/vhdl/elocations.adb.in
+++ b/src/vhdl/vhdl-elocations.adb.in
@@ -18,9 +18,9 @@
 
 with Tables;
 with Nodes;
-with Elocations_Meta; use Elocations_Meta;
+with Vhdl.Elocations_Meta; use Vhdl.Elocations_Meta;
 
-package body Elocations is
+package body Vhdl.Elocations is
 
    --  Format of a node.
    type Format_Type is
@@ -185,4 +185,4 @@ package body Elocations is
    procedure Set_Field6 is new Set_FieldX (6);
 
    --  Subprograms
-end Elocations;
+end Vhdl.Elocations;
diff --git a/src/vhdl/elocations.ads b/src/vhdl/vhdl-elocations.ads
index 82450debd..8772aec1b 100644
--- a/src/vhdl/elocations.ads
+++ b/src/vhdl/vhdl-elocations.ads
@@ -19,7 +19,7 @@
 with Types; use Types;
 with Iirs; use Iirs;
 
-package Elocations is
+package Vhdl.Elocations is
 
    -- Start of Iir_Kind.
 
@@ -696,4 +696,4 @@ package Elocations is
    --  Field: Field3
    function Get_Assign_Location (N : Iir) return Location_Type;
    procedure Set_Assign_Location (N : Iir; Loc : Location_Type);
-end Elocations;
+end Vhdl.Elocations;
diff --git a/src/vhdl/elocations_meta.adb b/src/vhdl/vhdl-elocations_meta.adb
index 1d66236a5..0b993f62c 100644
--- a/src/vhdl/elocations_meta.adb
+++ b/src/vhdl/vhdl-elocations_meta.adb
@@ -16,9 +16,9 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 
-with Elocations; use Elocations;
+with Vhdl.Elocations; use Vhdl.Elocations;
 
-package body Elocations_Meta is
+package body Vhdl.Elocations_Meta is
    function Get_Field_Image (F : Fields_Enum) return String is
    begin
       case F is
@@ -402,4 +402,4 @@ package body Elocations_Meta is
 
 
    pragma Warnings (On, """others"" choice is redundant");
-end Elocations_Meta;
+end Vhdl.Elocations_Meta;
diff --git a/src/vhdl/elocations_meta.adb.in b/src/vhdl/vhdl-elocations_meta.adb.in
index 279edcfde..f5dde00c6 100644
--- a/src/vhdl/elocations_meta.adb.in
+++ b/src/vhdl/vhdl-elocations_meta.adb.in
@@ -16,9 +16,9 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 
-with Elocations; use Elocations;
+with Vhdl.Elocations; use Vhdl.Elocations;
 
-package body Elocations_Meta is
+package body Vhdl.Elocations_Meta is
    function Get_Field_Image (F : Fields_Enum) return String is
    begin
       case F is
@@ -40,4 +40,4 @@ package body Elocations_Meta is
    --  FUNCS_BODY
 
    pragma Warnings (On, """others"" choice is redundant");
-end Elocations_Meta;
+end Vhdl.Elocations_Meta;
diff --git a/src/vhdl/elocations_meta.ads b/src/vhdl/vhdl-elocations_meta.ads
index 549951408..ad389daca 100644
--- a/src/vhdl/elocations_meta.ads
+++ b/src/vhdl/vhdl-elocations_meta.ads
@@ -19,7 +19,7 @@
 with Types; use Types;
 with Iirs; use Iirs;
 
-package Elocations_Meta is
+package Vhdl.Elocations_Meta is
    --  The enumeration of all fields defined in iirs.
    type Fields_Enum is
      (
@@ -66,4 +66,4 @@ package Elocations_Meta is
    function Has_Arrow_Location (K : Iir_Kind) return Boolean;
    function Has_Colon_Location (K : Iir_Kind) return Boolean;
    function Has_Assign_Location (K : Iir_Kind) return Boolean;
-end Elocations_Meta;
+end Vhdl.Elocations_Meta;
diff --git a/src/vhdl/elocations_meta.ads.in b/src/vhdl/vhdl-elocations_meta.ads.in
index d8595b143..dfbce3296 100644
--- a/src/vhdl/elocations_meta.ads.in
+++ b/src/vhdl/vhdl-elocations_meta.ads.in
@@ -19,7 +19,7 @@
 with Types; use Types;
 with Iirs; use Iirs;
 
-package Elocations_Meta is
+package Vhdl.Elocations_Meta is
    --  The enumeration of all fields defined in iirs.
    type Fields_Enum is
      (
@@ -33,4 +33,4 @@ package Elocations_Meta is
 
    --  Get/Set a field.
    --  FUNCS
-end Elocations_Meta;
+end Vhdl.Elocations_Meta;
diff --git a/src/vhdl/vhdl-parse.adb b/src/vhdl/vhdl-parse.adb
index fc45ff965..4c39d91bb 100644
--- a/src/vhdl/vhdl-parse.adb
+++ b/src/vhdl/vhdl-parse.adb
@@ -25,7 +25,7 @@ with Flags; use Flags;
 with Vhdl.Parse_Psl;
 with Str_Table;
 with Xrefs;
-with Elocations; use Elocations;
+with Vhdl.Elocations; use Vhdl.Elocations;
 
 --  Recursive descendant parser.
 --  Each subprogram (should) parse one production rules.