psl: add psl-types, psl-nodes_priv.

15 files changed, 15 insertions, 2 deletions

diff --git a/src/vhdl/simulate/simul-simulation-main.adb b/src/vhdl/simulate/simul-simulation-main.adb
index 3a9f5d5ce..41441ba06 100644
--- a/src/vhdl/simulate/simul-simulation-main.adb
+++ b/src/vhdl/simulate/simul-simulation-main.adb
@@ -21,6 +21,7 @@ with Ada.Text_IO; use Ada.Text_IO;
 with Types; use Types;
 with Vhdl.Utils; use Vhdl.Utils;
 with Vhdl.Errors; use Vhdl.Errors;
+with PSL.Types; use PSL.Types;
 with PSL.Nodes;
 with PSL.NFAs;
 with PSL.NFAs.Utils;
diff --git a/src/vhdl/translate/trans-chap9.adb b/src/vhdl/translate/trans-chap9.adb
index 92ed100d5..1e179c122 100644
--- a/src/vhdl/translate/trans-chap9.adb
+++ b/src/vhdl/translate/trans-chap9.adb
@@ -24,6 +24,7 @@ with Libraries;
 with Vhdl.Canon;
 with Trans_Analyzes;
 with Vhdl.Nodes_Meta;
+with PSL.Types; use PSL.Types;
 with PSL.Nodes;
 with PSL.NFAs;
 with PSL.NFAs.Utils;
diff --git a/src/vhdl/vhdl-canon.adb b/src/vhdl/vhdl-canon.adb
index b4f46769b..f0037d298 100644
--- a/src/vhdl/vhdl-canon.adb
+++ b/src/vhdl/vhdl-canon.adb
@@ -25,6 +25,7 @@ with Vhdl.Sem;
 with Vhdl.Sem_Inst;
 with Vhdl.Sem_Specs;
 with Vhdl.Nodes_Utils; use Vhdl.Nodes_Utils;
+with PSL.Types; use PSL.Types;
 with PSL.Nodes;
 with PSL.Rewrites;
 with PSL.Build;
diff --git a/src/vhdl/vhdl-canon_psl.ads b/src/vhdl/vhdl-canon_psl.ads
index d5805d480..7fe9820c9 100644
--- a/src/vhdl/vhdl-canon_psl.ads
+++ b/src/vhdl/vhdl-canon_psl.ads
@@ -16,8 +16,8 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 
-with Types; use Types;
 with Vhdl.Nodes; use Vhdl.Nodes;
+with PSL.Types; use PSL.Types;
 
 package Vhdl.Canon_PSL is
    --  Version of Canon.Canon_Extract_Sensitivity for PSL nodes.
diff --git a/src/vhdl/vhdl-disp_tree.adb b/src/vhdl/vhdl-disp_tree.adb
index c4953035d..cbf9c324a 100644
--- a/src/vhdl/vhdl-disp_tree.adb
+++ b/src/vhdl/vhdl-disp_tree.adb
@@ -22,6 +22,7 @@ with Logging; use Logging;
 with Name_Table;
 with Str_Table;
 with Files_Map;
+with PSL.Types; use PSL.Types;
 with PSL.Dump_Tree;
 with Vhdl.Nodes_Meta;
 
diff --git a/src/vhdl/vhdl-disp_vhdl.ads b/src/vhdl/vhdl-disp_vhdl.ads
index e69ab29f2..2a8531848 100644
--- a/src/vhdl/vhdl-disp_vhdl.ads
+++ b/src/vhdl/vhdl-disp_vhdl.ads
@@ -17,6 +17,7 @@
 --  02111-1307, USA.
 with Types; use Types;
 with Vhdl.Nodes; use Vhdl.Nodes;
+with PSL.Types; use PSL.Types;
 
 package Vhdl.Disp_Vhdl is
    -- General procedure to display a node.
diff --git a/src/vhdl/vhdl-nodes.ads b/src/vhdl/vhdl-nodes.ads
index 4fc779c6b..11917f8e8 100644
--- a/src/vhdl/vhdl-nodes.ads
+++ b/src/vhdl/vhdl-nodes.ads
@@ -21,6 +21,7 @@ with Vhdl.Tokens; use Vhdl.Tokens;
 with Vhdl.Nodes_Priv;
 with Vhdl.Lists;
 with Vhdl.Flists;
+with PSL.Types; use PSL.Types;
 
 package Vhdl.Nodes is
    --  This package defines the semantic tree and functions to handle it.
diff --git a/src/vhdl/vhdl-nodes_gc.adb b/src/vhdl/vhdl-nodes_gc.adb
index 7900355ec..250621cd9 100644
--- a/src/vhdl/vhdl-nodes_gc.adb
+++ b/src/vhdl/vhdl-nodes_gc.adb
@@ -24,6 +24,7 @@ with Vhdl.Errors; use Vhdl.Errors;
 with Libraries;
 with Vhdl.Disp_Tree;
 with Vhdl.Std_Package;
+with PSL.Types; use PSL.Types;
 
 package body Vhdl.Nodes_GC is
 
diff --git a/src/vhdl/vhdl-nodes_meta.ads b/src/vhdl/vhdl-nodes_meta.ads
index 02f86439e..ee64fc92d 100644
--- a/src/vhdl/vhdl-nodes_meta.ads
+++ b/src/vhdl/vhdl-nodes_meta.ads
@@ -19,6 +19,7 @@
 with Types; use Types;
 with Vhdl.Nodes; use Vhdl.Nodes;
 with Vhdl.Tokens; use Vhdl.Tokens;
+with PSL.Types; use PSL.Types;
 
 package Vhdl.Nodes_Meta is
    --  The enumeration of all possible types in the nodes.
diff --git a/src/vhdl/vhdl-nodes_meta.ads.in b/src/vhdl/vhdl-nodes_meta.ads.in
index fe345df78..234b8631e 100644
--- a/src/vhdl/vhdl-nodes_meta.ads.in
+++ b/src/vhdl/vhdl-nodes_meta.ads.in
@@ -19,6 +19,7 @@
 with Types; use Types;
 with Vhdl.Nodes; use Vhdl.Nodes;
 with Vhdl.Tokens; use Vhdl.Tokens;
+with PSL.Types; use PSL.Types;
 
 package Vhdl.Nodes_Meta is
    --  The enumeration of all possible types in the nodes.
diff --git a/src/vhdl/vhdl-parse.adb b/src/vhdl/vhdl-parse.adb
index d21fd97ff..4050a4b25 100644
--- a/src/vhdl/vhdl-parse.adb
+++ b/src/vhdl/vhdl-parse.adb
@@ -27,6 +27,7 @@ with Vhdl.Parse_Psl;
 with Str_Table;
 with Vhdl.Xrefs;
 with Vhdl.Elocations; use Vhdl.Elocations;
+with PSL.Types; use PSL.Types;
 
 --  Recursive descendant parser.
 --  Each subprogram (should) parse one production rules.
diff --git a/src/vhdl/vhdl-parse_psl.adb b/src/vhdl/vhdl-parse_psl.adb
index 3c44b7213..aff5967c2 100644
--- a/src/vhdl/vhdl-parse_psl.adb
+++ b/src/vhdl/vhdl-parse_psl.adb
@@ -16,6 +16,7 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 
+with Types; use Types;
 with Errorout; use Errorout;
 with PSL.Nodes; use PSL.Nodes;
 with Vhdl.Nodes;
diff --git a/src/vhdl/vhdl-parse_psl.ads b/src/vhdl/vhdl-parse_psl.ads
index 717663ecc..f7128ac40 100644
--- a/src/vhdl/vhdl-parse_psl.ads
+++ b/src/vhdl/vhdl-parse_psl.ads
@@ -16,7 +16,7 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 
-with Types; use Types;
+with PSL.Types; use PSL.Types;
 with Vhdl.Tokens; use Vhdl.Tokens;
 
 package Vhdl.Parse_Psl is
diff --git a/src/vhdl/vhdl-sem_psl.adb b/src/vhdl/vhdl-sem_psl.adb
index 6bb25e347..d6ead5002 100644
--- a/src/vhdl/vhdl-sem_psl.adb
+++ b/src/vhdl/vhdl-sem_psl.adb
@@ -17,6 +17,7 @@
 --  02111-1307, USA.
 
 with Types; use Types;
+with PSL.Types; use PSL.Types;
 with PSL.Nodes; use PSL.Nodes;
 with PSL.Subsets;
 with PSL.Hash;
diff --git a/src/vhdl/vhdl-utils.ads b/src/vhdl/vhdl-utils.ads
index 478b54c62..f94d5996e 100644
--- a/src/vhdl/vhdl-utils.ads
+++ b/src/vhdl/vhdl-utils.ads
@@ -17,6 +17,7 @@
 --  02111-1307, USA.
 with Types; use Types;
 with Vhdl.Nodes; use Vhdl.Nodes;
+with PSL.Types; use PSL.Types;
 
 package Vhdl.Utils is
    --  Transform the current token into an iir literal.