vhdl: move iirs_utils to vhdl.utils

55 files changed, 75 insertions, 75 deletions

diff --git a/src/ghdldrv/ghdllocal.adb b/src/ghdldrv/ghdllocal.adb
index 8b261279b..e5fe38401 100644
--- a/src/ghdldrv/ghdllocal.adb
+++ b/src/ghdldrv/ghdllocal.adb
@@ -32,7 +32,7 @@ with Errorout;
 with Vhdl.Configuration;
 with Files_Map;
 with Options;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 
 package body Ghdllocal is
    --  Version of the IEEE library to use.  This just change paths.
diff --git a/src/ghdldrv/ghdlprint.adb b/src/ghdldrv/ghdlprint.adb
index 1795a39f6..73f386f4a 100644
--- a/src/ghdldrv/ghdlprint.adb
+++ b/src/ghdldrv/ghdlprint.adb
@@ -26,7 +26,7 @@ with Name_Table; use Name_Table;
 with Files_Map;
 with Libraries;
 with Errorout; use Errorout;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Vhdl.Tokens;
 with Vhdl.Scanner;
 with Vhdl.Parse;
diff --git a/src/ghdldrv/ghdlsimul.adb b/src/ghdldrv/ghdlsimul.adb
index b465ed8cc..e3c9ced5b 100644
--- a/src/ghdldrv/ghdlsimul.adb
+++ b/src/ghdldrv/ghdlsimul.adb
@@ -30,7 +30,7 @@ with Vhdl.Std_Package;
 with Libraries;
 with Vhdl.Canon;
 with Vhdl.Configuration;
-with Iirs_Utils;
+with Vhdl.Utils;
 with Simul.Annotations;
 with Simul.Elaboration;
 with Simul.Simulation.Main;
@@ -113,7 +113,7 @@ package body Ghdlsimul is
          Conf_Unit : constant Iir := Get_Library_Unit (Top_Conf);
          Arch : constant Iir := Get_Named_Entity
            (Get_Block_Specification (Get_Block_Configuration (Conf_Unit)));
-         Entity : constant Iir := Iirs_Utils.Get_Entity (Arch);
+         Entity : constant Iir := Vhdl.Utils.Get_Entity (Arch);
       begin
          Vhdl.Configuration.Check_Entity_Declaration_Top (Entity);
          if Nbr_Errors > 0 then
diff --git a/src/libraries.adb b/src/libraries.adb
index 716438ca6..0f552e911 100644
--- a/src/libraries.adb
+++ b/src/libraries.adb
@@ -22,7 +22,7 @@ with Logging; use Logging;
 with Tables;
 with Errorout; use Errorout;
 with Vhdl.Scanner;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Name_Table; use Name_Table;
 with Str_Table;
 with Vhdl.Tokens;
@@ -722,7 +722,7 @@ package body Libraries is
       end if;
 
       --  Check if the library has already been loaded.
-      Library := Iirs_Utils.Find_Name_In_Chain (Libraries_Chain, Ident);
+      Library := Vhdl.Utils.Find_Name_In_Chain (Libraries_Chain, Ident);
       if Library /= Null_Iir then
          return Library;
       end if;
@@ -918,7 +918,7 @@ package body Libraries is
 
                         --  Keep direct reference (for speed-up).
                         if Get_Kind (El) /= Iir_Kind_Design_Unit then
-                           Iirs_Utils.Free_Recursive (El);
+                           Vhdl.Utils.Free_Recursive (El);
                            Set_Element (It, Unit);
                         end if;
 
diff --git a/src/synth/synth-context.adb b/src/synth/synth-context.adb
index 95eb09baa..a84f56e38 100644
--- a/src/synth/synth-context.adb
+++ b/src/synth/synth-context.adb
@@ -23,7 +23,7 @@ with Ada.Unchecked_Deallocation;
 with Types; use Types;
 with Grt.Types; use Grt.Types;
 with Errorout; use Errorout;
-with Iirs_Utils;
+with Vhdl.Utils;
 
 with Vhdl.Std_Package;
 with Vhdl.Ieee.Std_Logic_1164;
@@ -97,7 +97,7 @@ package body Synth.Context is
                  (Kind, Obj, Bounds_To_Range (Val.Bounds.D (1)));
             end if;
             if Is_Bit_Type (Get_Element_Subtype (Btype))
-              and then Iirs_Utils.Get_Nbr_Dimensions (Btype) = 1
+              and then Vhdl.Utils.Get_Nbr_Dimensions (Btype) = 1
             then
                --  A vector of bits.
                return Alloc_Wire
diff --git a/src/synth/synth-stmts.adb b/src/synth/synth-stmts.adb
index 8453b58fa..613bcdbdd 100644
--- a/src/synth/synth-stmts.adb
+++ b/src/synth/synth-stmts.adb
@@ -26,7 +26,7 @@ with Areapools;
 with Errorout; use Errorout;
 
 with Vhdl.Sem_Expr;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Vhdl.Ieee.Std_Logic_1164;
 with Vhdl.Evaluation;
 
diff --git a/src/synth/synth-types.adb b/src/synth/synth-types.adb
index f1478fb18..19e9677ec 100644
--- a/src/synth/synth-types.adb
+++ b/src/synth/synth-types.adb
@@ -21,7 +21,7 @@
 with Types; use Types;
 with Vhdl.Std_Package;
 with Vhdl.Ieee.Std_Logic_1164;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 
 with Simul.Environments; use Simul.Environments;
 with Simul.Execution;
diff --git a/src/synth/synthesis.adb b/src/synth/synthesis.adb
index a32ce2fd2..770fb52c9 100644
--- a/src/synth/synthesis.adb
+++ b/src/synth/synthesis.adb
@@ -24,7 +24,7 @@ with Name_Table; use Name_Table;
 with Netlists.Builders; use Netlists.Builders;
 with Netlists.Utils;
 
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Simul.Environments; use Simul.Environments;
 with Simul.Elaboration; use Simul.Elaboration;
 
diff --git a/src/vhdl/errorout.adb b/src/vhdl/errorout.adb
index cc292b4b2..2dd867246 100644
--- a/src/vhdl/errorout.adb
+++ b/src/vhdl/errorout.adb
@@ -19,7 +19,7 @@
 with Logging; use Logging;
 with Vhdl.Scanner;
 with Name_Table;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Files_Map; use Files_Map;
 with Ada.Strings.Unbounded;
 with Std_Names;
diff --git a/src/vhdl/iirs_walk.adb b/src/vhdl/iirs_walk.adb
index 3bc4ecf07..c367af9e6 100644
--- a/src/vhdl/iirs_walk.adb
+++ b/src/vhdl/iirs_walk.adb
@@ -16,7 +16,7 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Errorout; use Errorout;
 
 package body Iirs_Walk is
diff --git a/src/vhdl/simulate/simul-annotations.adb b/src/vhdl/simulate/simul-annotations.adb
index 22ca12a07..6fe7852f6 100644
--- a/src/vhdl/simulate/simul-annotations.adb
+++ b/src/vhdl/simulate/simul-annotations.adb
@@ -20,7 +20,7 @@ with Tables;
 with Ada.Text_IO;
 with Vhdl.Std_Package;
 with Errorout; use Errorout;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Types; use Types;
 
 package body Simul.Annotations is
diff --git a/src/vhdl/simulate/simul-debugger-ams.adb b/src/vhdl/simulate/simul-debugger-ams.adb
index ab4cfa36b..adbb1df69 100644
--- a/src/vhdl/simulate/simul-debugger-ams.adb
+++ b/src/vhdl/simulate/simul-debugger-ams.adb
@@ -16,7 +16,7 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Ada.Text_IO; use Ada.Text_IO;
 with Vhdl.Disp_Vhdl;
 
diff --git a/src/vhdl/simulate/simul-debugger.adb b/src/vhdl/simulate/simul-debugger.adb
index e96a8100e..f094073e2 100644
--- a/src/vhdl/simulate/simul-debugger.adb
+++ b/src/vhdl/simulate/simul-debugger.adb
@@ -35,7 +35,7 @@ with Vhdl.Std_Package;
 with Simul.Annotations; use Simul.Annotations;
 with Simul.Elaboration; use Simul.Elaboration;
 with Simul.Execution; use Simul.Execution;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Errorout; use Errorout;
 with Vhdl.Disp_Vhdl;
 with Iirs_Walk; use Iirs_Walk;
diff --git a/src/vhdl/simulate/simul-elaboration.adb b/src/vhdl/simulate/simul-elaboration.adb
index a961aeeae..da8c15664 100644
--- a/src/vhdl/simulate/simul-elaboration.adb
+++ b/src/vhdl/simulate/simul-elaboration.adb
@@ -21,7 +21,7 @@ with Str_Table;
 with Errorout; use Errorout;
 with Vhdl.Evaluation;
 with Simul.Execution; use Simul.Execution;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Libraries;
 with Name_Table;
 with Simul.File_Operation;
diff --git a/src/vhdl/simulate/simul-execution.adb b/src/vhdl/simulate/simul-execution.adb
index d40a093cb..b820e6425 100644
--- a/src/vhdl/simulate/simul-execution.adb
+++ b/src/vhdl/simulate/simul-execution.adb
@@ -24,7 +24,7 @@ with Flags; use Flags;
 with Errorout; use Errorout;
 with Vhdl.Std_Package;
 with Vhdl.Evaluation;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Simul.Annotations; use Simul.Annotations;
 with Name_Table;
 with Simul.File_Operation;
diff --git a/src/vhdl/simulate/simul-simulation-main.adb b/src/vhdl/simulate/simul-simulation-main.adb
index 141e1fd2d..ab9b083fc 100644
--- a/src/vhdl/simulate/simul-simulation-main.adb
+++ b/src/vhdl/simulate/simul-simulation-main.adb
@@ -19,7 +19,7 @@
 with Ada.Unchecked_Conversion;
 with Ada.Text_IO; use Ada.Text_IO;
 with Types; use Types;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Errorout; use Errorout;
 with PSL.Nodes;
 with PSL.NFAs;
diff --git a/src/vhdl/translate/ortho_front.adb b/src/vhdl/translate/ortho_front.adb
index 9a0afe2e5..f29dfa76f 100644
--- a/src/vhdl/translate/ortho_front.adb
+++ b/src/vhdl/translate/ortho_front.adb
@@ -24,7 +24,7 @@ with Hash;
 with Interning;
 with Vhdl.Nodes; use Vhdl.Nodes;
 with Libraries;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Vhdl.Std_Package;
 with Flags;
 with Vhdl.Configuration;
diff --git a/src/vhdl/translate/trans-chap1.adb b/src/vhdl/translate/trans-chap1.adb
index a8b61c4d4..164f7df3b 100644
--- a/src/vhdl/translate/trans-chap1.adb
+++ b/src/vhdl/translate/trans-chap1.adb
@@ -16,7 +16,7 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 with Errorout; use Errorout;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Translation; use Translation;
 with Trans.Chap2;
 with Trans.Chap3;
diff --git a/src/vhdl/translate/trans-chap12.adb b/src/vhdl/translate/trans-chap12.adb
index f739edb53..540f775d6 100644
--- a/src/vhdl/translate/trans-chap12.adb
+++ b/src/vhdl/translate/trans-chap12.adb
@@ -19,7 +19,7 @@
 with Vhdl.Configuration;
 with Errorout; use Errorout;
 with Vhdl.Std_Package; use Vhdl.Std_Package;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Libraries;
 with Flags;
 with Vhdl.Sem;
diff --git a/src/vhdl/translate/trans-chap14.adb b/src/vhdl/translate/trans-chap14.adb
index df6b937e3..439fc7035 100644
--- a/src/vhdl/translate/trans-chap14.adb
+++ b/src/vhdl/translate/trans-chap14.adb
@@ -19,7 +19,7 @@
 with Vhdl.Evaluation; use Vhdl.Evaluation;
 with Vhdl.Std_Package; use Vhdl.Std_Package;
 with Errorout; use Errorout;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Trans_Decls; use Trans_Decls;
 with Trans.Chap3;
 with Trans.Chap6;
diff --git a/src/vhdl/translate/trans-chap2.adb b/src/vhdl/translate/trans-chap2.adb
index 5b14d6ab5..0546a5cb7 100644
--- a/src/vhdl/translate/trans-chap2.adb
+++ b/src/vhdl/translate/trans-chap2.adb
@@ -21,7 +21,7 @@ with Vhdl.Std_Package; use Vhdl.Std_Package;
 with Errorout; use Errorout;
 with Vhdl.Sem_Inst;
 with Vhdl.Nodes_Meta;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Trans.Chap3;
 with Trans.Chap4;
 with Trans.Chap5;
diff --git a/src/vhdl/translate/trans-chap3.adb b/src/vhdl/translate/trans-chap3.adb
index f9685f284..9388c8fdc 100644
--- a/src/vhdl/translate/trans-chap3.adb
+++ b/src/vhdl/translate/trans-chap3.adb
@@ -18,7 +18,7 @@
 
 with Name_Table;
 with Errorout; use Errorout;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Vhdl.Evaluation; use Vhdl.Evaluation;
 with Trans.Chap2;
 with Trans.Chap4;
diff --git a/src/vhdl/translate/trans-chap4.adb b/src/vhdl/translate/trans-chap4.adb
index 01a198563..91861f0c6 100644
--- a/src/vhdl/translate/trans-chap4.adb
+++ b/src/vhdl/translate/trans-chap4.adb
@@ -18,7 +18,7 @@
 
 with Errorout; use Errorout;
 with Files_Map;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Vhdl.Std_Package; use Vhdl.Std_Package;
 with Vhdl.Canon;
 with Translation; use Translation;
diff --git a/src/vhdl/translate/trans-chap5.adb b/src/vhdl/translate/trans-chap5.adb
index 0b700189f..b9c8e42d3 100644
--- a/src/vhdl/translate/trans-chap5.adb
+++ b/src/vhdl/translate/trans-chap5.adb
@@ -17,7 +17,7 @@
 --  02111-1307, USA.
 
 with Errorout; use Errorout;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Trans.Chap3;
 with Trans.Chap4;
 with Trans.Chap6;
diff --git a/src/vhdl/translate/trans-chap6.adb b/src/vhdl/translate/trans-chap6.adb
index 383dd8ce8..ffb0581a0 100644
--- a/src/vhdl/translate/trans-chap6.adb
+++ b/src/vhdl/translate/trans-chap6.adb
@@ -18,7 +18,7 @@
 
 with Files_Map;
 with Errorout; use Errorout;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Vhdl.Evaluation; use Vhdl.Evaluation;
 with Trans.Chap3;
 with Trans.Chap7;
diff --git a/src/vhdl/translate/trans-chap7.adb b/src/vhdl/translate/trans-chap7.adb
index ebde37648..85b74416e 100644
--- a/src/vhdl/translate/trans-chap7.adb
+++ b/src/vhdl/translate/trans-chap7.adb
@@ -19,7 +19,7 @@
 with Ada.Text_IO;
 with Name_Table;
 with Str_Table;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Iir_Chains; use Iir_Chains;
 with Vhdl.Std_Package; use Vhdl.Std_Package;
 with Errorout; use Errorout;
diff --git a/src/vhdl/translate/trans-chap8.adb b/src/vhdl/translate/trans-chap8.adb
index 4819a0e16..59bbca656 100644
--- a/src/vhdl/translate/trans-chap8.adb
+++ b/src/vhdl/translate/trans-chap8.adb
@@ -23,7 +23,7 @@ with Iir_Chains;
 with Vhdl.Canon;
 with Vhdl.Evaluation; use Vhdl.Evaluation;
 with Vhdl.Std_Package; use Vhdl.Std_Package;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Trans.Chap2;
 with Trans.Chap3;
 with Trans.Chap4;
diff --git a/src/vhdl/translate/trans-chap9.adb b/src/vhdl/translate/trans-chap9.adb
index cc5e38834..f6f7cc465 100644
--- a/src/vhdl/translate/trans-chap9.adb
+++ b/src/vhdl/translate/trans-chap9.adb
@@ -16,7 +16,7 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Errorout; use Errorout;
 with Vhdl.Std_Package; use Vhdl.Std_Package;
 with Flags;
diff --git a/src/vhdl/translate/trans-rtis.adb b/src/vhdl/translate/trans-rtis.adb
index b0997006d..49b5b30a2 100644
--- a/src/vhdl/translate/trans-rtis.adb
+++ b/src/vhdl/translate/trans-rtis.adb
@@ -19,7 +19,7 @@
 with Name_Table;
 with Files_Map;
 with Errorout; use Errorout;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Vhdl.Configuration;
 with Libraries;
 with Trans.Chap7;
diff --git a/src/vhdl/translate/trans_analyzes.adb b/src/vhdl/translate/trans_analyzes.adb
index 3ad9c3e25..2d4aef0d6 100644
--- a/src/vhdl/translate/trans_analyzes.adb
+++ b/src/vhdl/translate/trans_analyzes.adb
@@ -16,7 +16,7 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Iirs_Walk; use Iirs_Walk;
 with Vhdl.Disp_Vhdl;
 with Ada.Text_IO;
diff --git a/src/vhdl/translate/translation.adb b/src/vhdl/translate/translation.adb
index c1cb1e0a4..3f2ce1a7f 100644
--- a/src/vhdl/translate/translation.adb
+++ b/src/vhdl/translate/translation.adb
@@ -24,7 +24,7 @@ with Errorout; use Errorout;
 with Name_Table; -- use Name_Table;
 with Str_Table;
 with Files_Map;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Vhdl.Std_Package; use Vhdl.Std_Package;
 with Vhdl.Sem_Specs;
 with Libraries;
diff --git a/src/vhdl/vhdl-canon.adb b/src/vhdl/vhdl-canon.adb
index 2c27e61d7..379adaed6 100644
--- a/src/vhdl/vhdl-canon.adb
+++ b/src/vhdl/vhdl-canon.adb
@@ -16,7 +16,7 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 with Errorout; use Errorout;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Types; use Types;
 with Flags; use Flags;
 with Name_Table;
diff --git a/src/vhdl/vhdl-canon_psl.adb b/src/vhdl/vhdl-canon_psl.adb
index 08cb84d05..a130b0a5e 100644
--- a/src/vhdl/vhdl-canon_psl.adb
+++ b/src/vhdl/vhdl-canon_psl.adb
@@ -19,7 +19,7 @@
 with PSL.Nodes; use PSL.Nodes;
 with PSL.Errors; use PSL.Errors;
 with Vhdl.Canon; use Vhdl.Canon;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 
 package body Vhdl.Canon_PSL is
    --  Version of Canon.Canon_Extract_Sensitivity for PSL nodes.
diff --git a/src/vhdl/vhdl-configuration.adb b/src/vhdl/vhdl-configuration.adb
index 0c688a083..6b371d601 100644
--- a/src/vhdl/vhdl-configuration.adb
+++ b/src/vhdl/vhdl-configuration.adb
@@ -21,7 +21,7 @@ with Errorout; use Errorout;
 with Vhdl.Std_Package;
 with Name_Table; use Name_Table;
 with Flags;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Iirs_Walk;
 with Vhdl.Sem_Scopes;
 with Vhdl.Sem_Lib; use Vhdl.Sem_Lib;
diff --git a/src/vhdl/vhdl-disp_vhdl.adb b/src/vhdl/vhdl-disp_vhdl.adb
index acf7f0c5f..b6904c07f 100644
--- a/src/vhdl/vhdl-disp_vhdl.adb
+++ b/src/vhdl/vhdl-disp_vhdl.adb
@@ -24,7 +24,7 @@ with GNAT.OS_Lib;
 with Vhdl.Std_Package;
 with Flags; use Flags;
 with Errorout; use Errorout;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Name_Table;
 with Str_Table;
 with Std_Names;
@@ -262,7 +262,7 @@ package body Vhdl.Disp_Vhdl is
             Put (".all");
          when Iir_Kind_Simple_Name
            | Iir_Kind_Character_Literal =>
-            Put (Iirs_Utils.Image_Identifier (Name));
+            Put (Utils.Image_Identifier (Name));
          when Iir_Kind_Operator_Symbol =>
             Disp_Function_Name (Name);
          when Iir_Kind_Selected_Name =>
@@ -2114,7 +2114,7 @@ package body Vhdl.Disp_Vhdl is
          Put ("(");
       end if;
       Disp_Expression (Get_Left (Expr));
-      Put (' ' & Name_Table.Image (Iirs_Utils.Get_Operator_Name (Expr)) & ' ');
+      Put (' ' & Name_Table.Image (Utils.Get_Operator_Name (Expr)) & ' ');
       Disp_Expression (Get_Right (Expr));
       if Flag_Parenthesis then
          Put (")");
@@ -2128,7 +2128,7 @@ package body Vhdl.Disp_Vhdl is
          return;
       end if;
 
-      Put (Name_Table.Image (Iirs_Utils.Get_Operator_Name (Expr)));
+      Put (Name_Table.Image (Utils.Get_Operator_Name (Expr)));
       Put (' ');
       if Flag_Parenthesis then
          Put ('(');
diff --git a/src/vhdl/vhdl-evaluation.adb b/src/vhdl/vhdl-evaluation.adb
index 11776b1b6..65d099a42 100644
--- a/src/vhdl/vhdl-evaluation.adb
+++ b/src/vhdl/vhdl-evaluation.adb
@@ -21,7 +21,7 @@ with Vhdl.Scanner;
 with Errorout; use Errorout;
 with Name_Table; use Name_Table;
 with Str_Table;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Vhdl.Std_Package; use Vhdl.Std_Package;
 with Flags; use Flags;
 with Std_Names;
diff --git a/src/vhdl/vhdl-ieee-vital_timing.adb b/src/vhdl/vhdl-ieee-vital_timing.adb
index 0cd175a05..c4263672a 100644
--- a/src/vhdl/vhdl-ieee-vital_timing.adb
+++ b/src/vhdl/vhdl-ieee-vital_timing.adb
@@ -26,7 +26,7 @@ with Vhdl.Sem_Scopes;
 with Vhdl.Sem_Specs;
 with Vhdl.Evaluation;
 with Vhdl.Sem;
-with Iirs_Utils;
+with Vhdl.Utils;
 
 package body Vhdl.Ieee.Vital_Timing is
    --  This package is based on IEEE 1076.4 1995.
@@ -1312,7 +1312,7 @@ package body Vhdl.Ieee.Vital_Timing is
       --  IEEE 1076.4 4.1
       --  The entity associated with a Level 0 architecture shall be a VITAL
       --  Level 0 entity.
-      if not Is_Vital_Level0 (Iirs_Utils.Get_Entity (Arch)) then
+      if not Is_Vital_Level0 (Utils.Get_Entity (Arch)) then
          Error_Vital (+Arch, "entity associated with a VITAL level 0 "
                         & "architecture shall be a VITAL level 0 entity");
       end if;
diff --git a/src/vhdl/vhdl-ieee.adb b/src/vhdl/vhdl-ieee.adb
index 8d1021efb..69d5196f0 100644
--- a/src/vhdl/vhdl-ieee.adb
+++ b/src/vhdl/vhdl-ieee.adb
@@ -16,7 +16,7 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Vhdl.Std_Package;
 
 package body Vhdl.Ieee is
diff --git a/src/vhdl/vhdl-parse.adb b/src/vhdl/vhdl-parse.adb
index ac1fa7b94..dfd98c400 100644
--- a/src/vhdl/vhdl-parse.adb
+++ b/src/vhdl/vhdl-parse.adb
@@ -18,7 +18,7 @@
 with Iir_Chains; use Iir_Chains;
 with Vhdl.Tokens; use Vhdl.Tokens;
 with Vhdl.Scanner; use Vhdl.Scanner;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Errorout; use Errorout;
 with Std_Names; use Std_Names;
 with Flags; use Flags;
diff --git a/src/vhdl/vhdl-sem.adb b/src/vhdl/vhdl-sem.adb
index 8cc7f934f..077d9c5f6 100644
--- a/src/vhdl/vhdl-sem.adb
+++ b/src/vhdl/vhdl-sem.adb
@@ -28,7 +28,7 @@ with Vhdl.Sem_Decls; use Vhdl.Sem_Decls;
 with Vhdl.Sem_Assocs; use Vhdl.Sem_Assocs;
 with Vhdl.Sem_Inst;
 with Vhdl.Sem_Lib; use Vhdl.Sem_Lib;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Flags; use Flags;
 with Str_Table;
 with Vhdl.Sem_Utils;
diff --git a/src/vhdl/vhdl-sem_assocs.adb b/src/vhdl/vhdl-sem_assocs.adb
index b56692a40..6a9226fe0 100644
--- a/src/vhdl/vhdl-sem_assocs.adb
+++ b/src/vhdl/vhdl-sem_assocs.adb
@@ -19,7 +19,7 @@ with Vhdl.Evaluation; use Vhdl.Evaluation;
 with Errorout; use Errorout;
 with Flags; use Flags;
 with Types; use Types;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Vhdl.Parse;
 with Std_Names;
 with Vhdl.Sem_Names; use Vhdl.Sem_Names;
diff --git a/src/vhdl/vhdl-sem_decls.adb b/src/vhdl/vhdl-sem_decls.adb
index 24d07d77f..507ed1a3f 100644
--- a/src/vhdl/vhdl-sem_decls.adb
+++ b/src/vhdl/vhdl-sem_decls.adb
@@ -22,7 +22,7 @@ with Vhdl.Tokens;
 with Flags; use Flags;
 with Vhdl.Std_Package; use Vhdl.Std_Package;
 with Vhdl.Evaluation; use Vhdl.Evaluation;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Vhdl.Sem; use Vhdl.Sem;
 with Vhdl.Sem_Utils; use Vhdl.Sem_Utils;
 with Vhdl.Sem_Expr; use Vhdl.Sem_Expr;
diff --git a/src/vhdl/vhdl-sem_expr.adb b/src/vhdl/vhdl-sem_expr.adb
index 91ff0b950..096cd8961 100644
--- a/src/vhdl/vhdl-sem_expr.adb
+++ b/src/vhdl/vhdl-sem_expr.adb
@@ -25,7 +25,7 @@ with Vhdl.Sem_Names; use Vhdl.Sem_Names;
 with Vhdl.Sem;
 with Name_Table;
 with Str_Table;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Vhdl.Evaluation; use Vhdl.Evaluation;
 with Iir_Chains; use Iir_Chains;
 with Vhdl.Sem_Types;
@@ -1765,7 +1765,7 @@ package body Vhdl.Sem_Expr is
          Left := Get_Left (Expr);
          Right := Get_Right (Expr);
       end if;
-      Operator := Iirs_Utils.Get_Operator_Name (Expr);
+      Operator := Utils.Get_Operator_Name (Expr);
 
       if Get_Type (Expr) = Null_Iir then
          --  First pass.
diff --git a/src/vhdl/vhdl-sem_inst.adb b/src/vhdl/vhdl-sem_inst.adb
index 151bfda8f..7a8c6e36f 100644
--- a/src/vhdl/vhdl-sem_inst.adb
+++ b/src/vhdl/vhdl-sem_inst.adb
@@ -19,7 +19,7 @@ with Vhdl.Nodes_Priv;
 with Vhdl.Nodes_Meta;
 with Types; use Types;
 with Files_Map;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Errorout; use Errorout;
 with Vhdl.Sem_Utils;
 
diff --git a/src/vhdl/vhdl-sem_lib.adb b/src/vhdl/vhdl-sem_lib.adb
index fe788202d..050beeee9 100644
--- a/src/vhdl/vhdl-sem_lib.adb
+++ b/src/vhdl/vhdl-sem_lib.adb
@@ -18,7 +18,7 @@
 with Flags;
 with Name_Table;
 with Files_Map;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Errorout; use Errorout;
 with Libraries; use Libraries;
 with Vhdl.Scanner;
@@ -220,7 +220,7 @@ package body Vhdl.Sem_Lib is
       --  Move the unit in the library: keep the design_unit of the library,
       --  but replace the library_unit by the one that has been parsed.  Do
       --  not forget to relocate parents.
-      Iirs_Utils.Free_Recursive (Get_Library_Unit (Design_Unit));
+      Vhdl.Utils.Free_Recursive (Get_Library_Unit (Design_Unit));
       Set_Library_Unit (Design_Unit, Get_Library_Unit (Res));
       Set_Design_Unit (Get_Library_Unit (Res), Design_Unit);
       Set_Parent (Get_Library_Unit (Res), Design_Unit);
diff --git a/src/vhdl/vhdl-sem_names.adb b/src/vhdl/vhdl-sem_names.adb
index 85986cb78..8cf89d02a 100644
--- a/src/vhdl/vhdl-sem_names.adb
+++ b/src/vhdl/vhdl-sem_names.adb
@@ -16,7 +16,7 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 with Vhdl.Evaluation; use Vhdl.Evaluation;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Errorout; use Errorout;
 with Flags; use Flags;
 with Name_Table;
diff --git a/src/vhdl/vhdl-sem_psl.adb b/src/vhdl/vhdl-sem_psl.adb
index 5d782ed40..9dede6e06 100644
--- a/src/vhdl/vhdl-sem_psl.adb
+++ b/src/vhdl/vhdl-sem_psl.adb
@@ -26,7 +26,7 @@ with Vhdl.Sem_Stmts; use Vhdl.Sem_Stmts;
 with Vhdl.Sem_Scopes;
 with Vhdl.Sem_Names;
 with Std_Names;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Vhdl.Evaluation; use Vhdl.Evaluation;
 with Vhdl.Std_Package;
 with Vhdl.Ieee.Std_Logic_1164;
diff --git a/src/vhdl/vhdl-sem_scopes.adb b/src/vhdl/vhdl-sem_scopes.adb
index 8e616bd4b..c1f3fe8fd 100644
--- a/src/vhdl/vhdl-sem_scopes.adb
+++ b/src/vhdl/vhdl-sem_scopes.adb
@@ -21,7 +21,7 @@ with Flags; use Flags;
 with Name_Table; -- use Name_Table;
 with Files_Map; use Files_Map;
 with Errorout; use Errorout;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 
 package body Vhdl.Sem_Scopes is
    --  An interpretation cell is the element of the simply linked list
diff --git a/src/vhdl/vhdl-sem_specs.adb b/src/vhdl/vhdl-sem_specs.adb
index 5d3224ed0..6bf56aed5 100644
--- a/src/vhdl/vhdl-sem_specs.adb
+++ b/src/vhdl/vhdl-sem_specs.adb
@@ -15,7 +15,7 @@
 --  along with GHDL; see the file COPYING.  If not, write to the Free
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Vhdl.Sem_Expr; use Vhdl.Sem_Expr;
 with Vhdl.Sem_Names; use Vhdl.Sem_Names;
 with Vhdl.Evaluation; use Vhdl.Evaluation;
diff --git a/src/vhdl/vhdl-sem_stmts.adb b/src/vhdl/vhdl-sem_stmts.adb
index 9553dc7df..18c38f67d 100644
--- a/src/vhdl/vhdl-sem_stmts.adb
+++ b/src/vhdl/vhdl-sem_stmts.adb
@@ -29,7 +29,7 @@ with Vhdl.Sem_Types;
 with Vhdl.Sem_Psl;
 with Std_Names;
 with Vhdl.Evaluation; use Vhdl.Evaluation;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Vhdl.Xrefs; use Vhdl.Xrefs;
 
 package body Vhdl.Sem_Stmts is
diff --git a/src/vhdl/vhdl-sem_types.adb b/src/vhdl/vhdl-sem_types.adb
index 1769bdbfc..3ec8586ce 100644
--- a/src/vhdl/vhdl-sem_types.adb
+++ b/src/vhdl/vhdl-sem_types.adb
@@ -28,7 +28,7 @@ with Vhdl.Sem_Decls;
 with Vhdl.Sem_Inst;
 with Name_Table;
 with Std_Names;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Vhdl.Std_Package; use Vhdl.Std_Package;
 with Vhdl.Ieee.Std_Logic_1164;
 with Vhdl.Xrefs; use Vhdl.Xrefs;
diff --git a/src/vhdl/vhdl-sem_utils.adb b/src/vhdl/vhdl-sem_utils.adb
index 11585bb90..0f3045bdf 100644
--- a/src/vhdl/vhdl-sem_utils.adb
+++ b/src/vhdl/vhdl-sem_utils.adb
@@ -19,7 +19,7 @@ with Ada.Unchecked_Conversion;
 with Types; use Types;
 with Flags; use Flags;
 with Errorout; use Errorout;
-with Iirs_Utils; use Iirs_Utils;
+with Vhdl.Utils; use Vhdl.Utils;
 with Iir_Chains; use Iir_Chains;
 with Vhdl.Ieee.Std_Logic_1164;
 with Std_Names;
diff --git a/src/vhdl/vhdl-std_package.adb b/src/vhdl/vhdl-std_package.adb
index 78a614afd..fb68dfd64 100644
--- a/src/vhdl/vhdl-std_package.adb
+++ b/src/vhdl/vhdl-std_package.adb
@@ -21,7 +21,7 @@ with Name_Table;
 with Str_Table;
 with Std_Names; use Std_Names;
 with Flags; use Flags;
-with Iirs_Utils;
+with Vhdl.Utils;
 with Vhdl.Sem_Utils;
 with Iir_Chains;
 
@@ -66,7 +66,7 @@ package body Vhdl.Std_Package is
    is
       Res : Iir;
    begin
-      Res := Iirs_Utils.Build_Simple_Name (Ref, Std_Location);
+      Res := Utils.Build_Simple_Name (Ref, Std_Location);
       Set_Type (Res, Get_Type (Ref));
       return Res;
    end Create_Std_Type_Mark;
@@ -461,7 +461,7 @@ package body Vhdl.Std_Package is
          Create_Std_Type (Boolean_Type_Declaration, Boolean_Type_Definition,
                           Name_Boolean);
 
-         Iirs_Utils.Create_Range_Constraint_For_Enumeration_Type
+         Utils.Create_Range_Constraint_For_Enumeration_Type
            (Boolean_Type_Definition);
          Add_Implicit_Operations (Boolean_Type_Declaration);
       end;
@@ -498,7 +498,7 @@ package body Vhdl.Std_Package is
          -- type bit is
          Create_Std_Type (Bit_Type_Declaration, Bit_Type_Definition, Name_Bit);
 
-         Iirs_Utils.Create_Range_Constraint_For_Enumeration_Type
+         Utils.Create_Range_Constraint_For_Enumeration_Type
            (Bit_Type_Definition);
          Add_Implicit_Operations (Bit_Type_Declaration);
       end;
@@ -562,7 +562,7 @@ package body Vhdl.Std_Package is
            (Character_Type_Declaration, Character_Type_Definition,
             Name_Character);
 
-         Iirs_Utils.Create_Range_Constraint_For_Enumeration_Type
+         Utils.Create_Range_Constraint_For_Enumeration_Type
            (Character_Type_Definition);
          Add_Implicit_Operations (Character_Type_Declaration);
       end;
@@ -595,7 +595,7 @@ package body Vhdl.Std_Package is
            (Severity_Level_Type_Declaration, Severity_Level_Type_Definition,
             Name_Severity_Level);
 
-         Iirs_Utils.Create_Range_Constraint_For_Enumeration_Type
+         Utils.Create_Range_Constraint_For_Enumeration_Type
            (Severity_Level_Type_Definition);
          Add_Implicit_Operations (Severity_Level_Type_Declaration);
       end;
@@ -1151,7 +1151,7 @@ package body Vhdl.Std_Package is
            (File_Open_Kind_Type_Declaration, File_Open_Kind_Type_Definition,
             Name_File_Open_Kind);
 
-         Iirs_Utils.Create_Range_Constraint_For_Enumeration_Type
+         Utils.Create_Range_Constraint_For_Enumeration_Type
            (File_Open_Kind_Type_Definition);
          Add_Implicit_Operations (File_Open_Kind_Type_Declaration);
       else
@@ -1190,7 +1190,7 @@ package body Vhdl.Std_Package is
          Create_Std_Type (File_Open_Status_Type_Declaration,
                           File_Open_Status_Type_Definition,
                           Name_File_Open_Status);
-         Iirs_Utils.Create_Range_Constraint_For_Enumeration_Type
+         Utils.Create_Range_Constraint_For_Enumeration_Type
            (File_Open_Status_Type_Definition);
          Add_Implicit_Operations (File_Open_Status_Type_Declaration);
       else
@@ -1266,7 +1266,7 @@ package body Vhdl.Std_Package is
       Create_Wildcard_Type (Wildcard_Any_String_Type, "any string type");
       Create_Wildcard_Type (Wildcard_Any_Access_Type, "any access type");
 
-      Error_Type := Iirs_Utils.Create_Error_Type (Wildcard_Any_Type);
+      Error_Type := Utils.Create_Error_Type (Wildcard_Any_Type);
       Set_Error_Origin (Error_Type, Null_Iir);
       Create_Wildcard_Type (Error_Type, "unknown type");
    end Create_Std_Standard_Package;
diff --git a/src/vhdl/iirs_utils.adb b/src/vhdl/vhdl-utils.adb
index 960a85c40..e93becc60 100644
--- a/src/vhdl/iirs_utils.adb
+++ b/src/vhdl/vhdl-utils.adb
@@ -25,7 +25,7 @@ with Vhdl.Std_Package;
 with Flags; use Flags;
 with PSL.Nodes;
 
-package body Iirs_Utils is
+package body Vhdl.Utils is
    -- Transform the current token into an iir literal.
    -- The current token must be either a character or an identifier.
    function Current_Text return Iir is
@@ -1685,4 +1685,4 @@ package body Iirs_Utils is
    begin
       PSL.Nodes.Set_HDL_Node (N, PSL.Nodes.HDL_Node (Expr));
    end Set_HDL_Node;
-end Iirs_Utils;
+end Vhdl.Utils;
diff --git a/src/vhdl/iirs_utils.ads b/src/vhdl/vhdl-utils.ads
index acee1bc64..478b54c62 100644
--- a/src/vhdl/iirs_utils.ads
+++ b/src/vhdl/vhdl-utils.ads
@@ -18,7 +18,7 @@
 with Types; use Types;
 with Vhdl.Nodes; use Vhdl.Nodes;
 
-package Iirs_Utils is
+package Vhdl.Utils is
    --  Transform the current token into an iir literal.
    --  The current token must be either a character, a string or an identifier.
    function Current_Text return Iir;
@@ -372,4 +372,4 @@ package Iirs_Utils is
    --  IIR wrapper around Get_HDL_Node/Set_HDL_Node.
    function Get_HDL_Node (N : PSL_Node) return Iir;
    procedure Set_HDL_Node (N : PSL_Node; Expr : Iir);
-end Iirs_Utils;
+end Vhdl.Utils;