aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ghdldrv/ghdlxml.adb2
-rw-r--r--src/vhdl/Makefile9
-rw-r--r--src/vhdl/iir_chains.adb4
-rw-r--r--src/vhdl/iir_chains.ads4
-rw-r--r--src/vhdl/translate/trans-chap2.adb4
-rw-r--r--src/vhdl/translate/trans-chap9.adb4
-rw-r--r--src/vhdl/vhdl-disp_tree.adb6
-rw-r--r--src/vhdl/vhdl-nodes.adb2
-rw-r--r--src/vhdl/vhdl-nodes.adb.in2
-rw-r--r--src/vhdl/vhdl-nodes_gc.adb2
-rw-r--r--src/vhdl/vhdl-nodes_meta.adb (renamed from src/vhdl/nodes_meta.adb)4
-rw-r--r--src/vhdl/vhdl-nodes_meta.adb.in (renamed from src/vhdl/nodes_meta.adb.in)4
-rw-r--r--src/vhdl/vhdl-nodes_meta.ads (renamed from src/vhdl/nodes_meta.ads)4
-rw-r--r--src/vhdl/vhdl-nodes_meta.ads.in (renamed from src/vhdl/nodes_meta.ads.in)4
-rw-r--r--src/vhdl/vhdl-sem_inst.adb2
15 files changed, 29 insertions, 28 deletions
diff --git a/src/ghdldrv/ghdlxml.adb b/src/ghdldrv/ghdlxml.adb
index c855ad748..115f86d57 100644
--- a/src/ghdldrv/ghdlxml.adb
+++ b/src/ghdldrv/ghdlxml.adb
@@ -19,7 +19,7 @@ with Ada.Text_IO; use Ada.Text_IO;
with GNAT.OS_Lib; use GNAT.OS_Lib;
with Types; use Types;
with Name_Table; use Name_Table;
-with Nodes_Meta; use Nodes_Meta;
+with Vhdl.Nodes_Meta; use Vhdl.Nodes_Meta;
with Files_Map;
with Vhdl.Disp_Tree; use Vhdl.Disp_Tree;
with Ghdlprint; use Ghdlprint;
diff --git a/src/vhdl/Makefile b/src/vhdl/Makefile
index 43c288a11..be42197a5 100644
--- a/src/vhdl/Makefile
+++ b/src/vhdl/Makefile
@@ -25,14 +25,15 @@ PNODESPY=python/pnodespy.py
DEPS=vhdl-nodes.ads vhdl-nodes.adb.in $(PNODES)
-GEN_FILES=vhdl-nodes.adb nodes_meta.ads nodes_meta.adb \
+GEN_FILES=vhdl-nodes.adb vhdl-nodes_meta.ads vhdl-nodes_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
NODES_FLAGS=--node-file=vhdl-nodes.ads --field-file=vhdl-nodes.adb.in \
- --template-file=vhdl-nodes.adb.in --kind-file=vhdl-nodes.ads
+ --template-file=vhdl-nodes.adb.in --kind-file=vhdl-nodes.ads \
+ --meta-basename=vhdl-nodes_meta
ELOCATIONS_FLAGS=--node-file=vhdl-elocations.ads \
--field-file=vhdl-elocations.adb.in --kind-file=vhdl-nodes.ads \
@@ -45,12 +46,12 @@ vhdl-nodes.adb: vhdl-nodes.adb.in $(DEPS)
$(PNODES) $(NODES_FLAGS) body > $@
chmod -w $@
-nodes_meta.ads: nodes_meta.ads.in $(DEPS)
+vhdl-nodes_meta.ads: vhdl-nodes_meta.ads.in $(DEPS)
$(RM) $@
$(PNODES) $(NODES_FLAGS) meta_specs > $@
chmod -w $@
-nodes_meta.adb: nodes_meta.adb.in $(DEPS)
+vhdl-nodes_meta.adb: vhdl-nodes_meta.adb.in $(DEPS)
$(RM) $@
$(PNODES) $(NODES_FLAGS) meta_body > $@
chmod -w $@
diff --git a/src/vhdl/iir_chains.adb b/src/vhdl/iir_chains.adb
index 43d02d44f..ca2593bd7 100644
--- a/src/vhdl/iir_chains.adb
+++ b/src/vhdl/iir_chains.adb
@@ -29,9 +29,9 @@ package body Iir_Chains is
end Get_Chain_Length;
procedure Append_Chain
- (N : Iir; Field : Nodes_Meta.Fields_Enum; Chain : Iir)
+ (N : Iir; Field : Vhdl.Nodes_Meta.Fields_Enum; Chain : Iir)
is
- use Nodes_Meta;
+ use Vhdl.Nodes_Meta;
N_Chain : Iir;
Next_Chain : Iir;
begin
diff --git a/src/vhdl/iir_chains.ads b/src/vhdl/iir_chains.ads
index 7533ff7f1..f443341ab 100644
--- a/src/vhdl/iir_chains.ads
+++ b/src/vhdl/iir_chains.ads
@@ -18,7 +18,7 @@
with Vhdl.Nodes; use Vhdl.Nodes;
with Iir_Chain_Handling;
pragma Elaborate_All (Iir_Chain_Handling);
-with Nodes_Meta;
+with Vhdl.Nodes_Meta;
package Iir_Chains is
-- Chains are simply linked list of iirs.
@@ -87,7 +87,7 @@ package Iir_Chains is
-- Append CHAIN to the chain FIELD of node N. Not very efficient.
procedure Append_Chain
- (N : Iir; Field : Nodes_Meta.Fields_Enum; Chain : Iir);
+ (N : Iir; Field : Vhdl.Nodes_Meta.Fields_Enum; Chain : Iir);
-- These two subprograms can be used to build a sub-chain.
-- FIRST and LAST designates respectively the first and last element of
diff --git a/src/vhdl/translate/trans-chap2.adb b/src/vhdl/translate/trans-chap2.adb
index 41620bbfd..5b14d6ab5 100644
--- a/src/vhdl/translate/trans-chap2.adb
+++ b/src/vhdl/translate/trans-chap2.adb
@@ -20,7 +20,7 @@ with Std_Names;
with Vhdl.Std_Package; use Vhdl.Std_Package;
with Errorout; use Errorout;
with Vhdl.Sem_Inst;
-with Nodes_Meta;
+with Vhdl.Nodes_Meta;
with Iirs_Utils; use Iirs_Utils;
with Trans.Chap3;
with Trans.Chap4;
@@ -1373,7 +1373,7 @@ package body Trans.Chap2 is
end if;
declare
- use Nodes_Meta;
+ use Vhdl.Nodes_Meta;
Kind : constant Iir_Kind := Get_Kind (N);
Fields : constant Fields_Array := Get_Fields (Kind);
F : Fields_Enum;
diff --git a/src/vhdl/translate/trans-chap9.adb b/src/vhdl/translate/trans-chap9.adb
index f4dc4a422..cc5e38834 100644
--- a/src/vhdl/translate/trans-chap9.adb
+++ b/src/vhdl/translate/trans-chap9.adb
@@ -23,7 +23,7 @@ with Flags;
with Libraries;
with Vhdl.Canon;
with Trans_Analyzes;
-with Nodes_Meta;
+with Vhdl.Nodes_Meta;
with PSL.Nodes;
with PSL.NFAs;
with PSL.NFAs.Utils;
@@ -1253,7 +1253,7 @@ package body Trans.Chap9 is
end if;
declare
- use Nodes_Meta;
+ use Vhdl.Nodes_Meta;
Kind : constant Iir_Kind := Get_Kind (N);
Fields : constant Fields_Array := Get_Fields (Kind);
F : Fields_Enum;
diff --git a/src/vhdl/vhdl-disp_tree.adb b/src/vhdl/vhdl-disp_tree.adb
index d214957aa..02e750b16 100644
--- a/src/vhdl/vhdl-disp_tree.adb
+++ b/src/vhdl/vhdl-disp_tree.adb
@@ -23,7 +23,7 @@ with Name_Table;
with Str_Table;
with Files_Map;
with PSL.Dump_Tree;
-with Nodes_Meta;
+with Vhdl.Nodes_Meta;
-- Do not add a use clause for iirs_utils, as it may crash for ill-formed
-- trees, which is annoying while debugging.
@@ -376,7 +376,7 @@ package body Vhdl.Disp_Tree is
procedure Disp_Header (N : Iir)
is
- use Nodes_Meta;
+ use Vhdl.Nodes_Meta;
K : Iir_Kind;
begin
if N = Null_Iir then
@@ -439,7 +439,7 @@ package body Vhdl.Disp_Tree is
end;
declare
- use Nodes_Meta;
+ use Vhdl.Nodes_Meta;
Fields : constant Fields_Array := Get_Fields (Get_Kind (N));
F : Fields_Enum;
begin
diff --git a/src/vhdl/vhdl-nodes.adb b/src/vhdl/vhdl-nodes.adb
index 82c99b95c..e4c6c979e 100644
--- a/src/vhdl/vhdl-nodes.adb
+++ b/src/vhdl/vhdl-nodes.adb
@@ -20,7 +20,7 @@ with Ada.Unchecked_Conversion;
with Tables;
with Logging; use Logging;
with Lists; use Lists;
-with Nodes_Meta; use Nodes_Meta;
+with Vhdl.Nodes_Meta; use Vhdl.Nodes_Meta;
with Vhdl.Nodes_Priv; use Vhdl.Nodes_Priv;
package body Vhdl.Nodes is
diff --git a/src/vhdl/vhdl-nodes.adb.in b/src/vhdl/vhdl-nodes.adb.in
index 0dee1df81..1e9dd37c1 100644
--- a/src/vhdl/vhdl-nodes.adb.in
+++ b/src/vhdl/vhdl-nodes.adb.in
@@ -20,7 +20,7 @@ with Ada.Unchecked_Conversion;
with Tables;
with Logging; use Logging;
with Lists; use Lists;
-with Nodes_Meta; use Nodes_Meta;
+with Vhdl.Nodes_Meta; use Vhdl.Nodes_Meta;
with Vhdl.Nodes_Priv; use Vhdl.Nodes_Priv;
package body Vhdl.Nodes is
diff --git a/src/vhdl/vhdl-nodes_gc.adb b/src/vhdl/vhdl-nodes_gc.adb
index 1dc54f4bd..49fc0336a 100644
--- a/src/vhdl/vhdl-nodes_gc.adb
+++ b/src/vhdl/vhdl-nodes_gc.adb
@@ -19,7 +19,7 @@
with Ada.Unchecked_Deallocation;
with Types; use Types;
with Logging; use Logging;
-with Nodes_Meta; use Nodes_Meta;
+with Vhdl.Nodes_Meta; use Vhdl.Nodes_Meta;
with Errorout; use Errorout;
with Libraries;
with Vhdl.Disp_Tree;
diff --git a/src/vhdl/nodes_meta.adb b/src/vhdl/vhdl-nodes_meta.adb
index 0ccea3a42..f2752d528 100644
--- a/src/vhdl/nodes_meta.adb
+++ b/src/vhdl/vhdl-nodes_meta.adb
@@ -16,7 +16,7 @@
-- Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-- 02111-1307, USA.
-package body Nodes_Meta is
+package body Vhdl.Nodes_Meta is
Fields_Type : constant array (Fields_Enum) of Types_Enum :=
(
Field_First_Design_Unit => Type_Iir,
@@ -10783,4 +10783,4 @@ package body Nodes_Meta is
end case;
end Has_PSL_EOS_Flag;
-end Nodes_Meta;
+end Vhdl.Nodes_Meta;
diff --git a/src/vhdl/nodes_meta.adb.in b/src/vhdl/vhdl-nodes_meta.adb.in
index 8f9e96490..9018c747e 100644
--- a/src/vhdl/nodes_meta.adb.in
+++ b/src/vhdl/vhdl-nodes_meta.adb.in
@@ -16,7 +16,7 @@
-- Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-- 02111-1307, USA.
-package body Nodes_Meta is
+package body Vhdl.Nodes_Meta is
Fields_Type : constant array (Fields_Enum) of Types_Enum :=
(
-- FIELDS_TYPE
@@ -86,4 +86,4 @@ package body Nodes_Meta is
end Get_Fields;
-- FUNCS_BODY
-end Nodes_Meta;
+end Vhdl.Nodes_Meta;
diff --git a/src/vhdl/nodes_meta.ads b/src/vhdl/vhdl-nodes_meta.ads
index a5d308043..38113509f 100644
--- a/src/vhdl/nodes_meta.ads
+++ b/src/vhdl/vhdl-nodes_meta.ads
@@ -20,7 +20,7 @@ with Types; use Types;
with Vhdl.Nodes; use Vhdl.Nodes;
with Vhdl.Tokens; use Vhdl.Tokens;
-package Nodes_Meta is
+package Vhdl.Nodes_Meta is
-- The enumeration of all possible types in the nodes.
type Types_Enum is
(
@@ -921,4 +921,4 @@ package Nodes_Meta is
function Has_PSL_Nbr_States (K : Iir_Kind) return Boolean;
function Has_PSL_Clock_Sensitivity (K : Iir_Kind) return Boolean;
function Has_PSL_EOS_Flag (K : Iir_Kind) return Boolean;
-end Nodes_Meta;
+end Vhdl.Nodes_Meta;
diff --git a/src/vhdl/nodes_meta.ads.in b/src/vhdl/vhdl-nodes_meta.ads.in
index 2f8b435d9..fe345df78 100644
--- a/src/vhdl/nodes_meta.ads.in
+++ b/src/vhdl/vhdl-nodes_meta.ads.in
@@ -20,7 +20,7 @@ with Types; use Types;
with Vhdl.Nodes; use Vhdl.Nodes;
with Vhdl.Tokens; use Vhdl.Tokens;
-package Nodes_Meta is
+package Vhdl.Nodes_Meta is
-- The enumeration of all possible types in the nodes.
type Types_Enum is
(
@@ -70,4 +70,4 @@ package Nodes_Meta is
-- Get/Set a field.
-- FUNCS
-end Nodes_Meta;
+end Vhdl.Nodes_Meta;
diff --git a/src/vhdl/vhdl-sem_inst.adb b/src/vhdl/vhdl-sem_inst.adb
index 699b5b3e8..151bfda8f 100644
--- a/src/vhdl/vhdl-sem_inst.adb
+++ b/src/vhdl/vhdl-sem_inst.adb
@@ -16,7 +16,7 @@
with Tables;
with Vhdl.Nodes_Priv;
-with Nodes_Meta;
+with Vhdl.Nodes_Meta;
with Types; use Types;
with Files_Map;
with Iirs_Utils; use Iirs_Utils;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 15:44:08 +0000