vhdl: move disp_tree and disp_vhdl as vhdl child.

13 files changed, 33 insertions, 33 deletions

diff --git a/src/ghdldrv/ghdllocal.adb b/src/ghdldrv/ghdllocal.adb
index 297d39798..e0f5c6a24 100644
--- a/src/ghdldrv/ghdllocal.adb
+++ b/src/ghdldrv/ghdllocal.adb
@@ -25,7 +25,7 @@ with Std_Package;
 with Flags;
 with Name_Table;
 with Std_Names;
-with Disp_Vhdl;
+with Vhdl.Disp_Vhdl;
 with Default_Paths;
 with Vhdl.Scanner;
 with Errorout;
@@ -1116,7 +1116,7 @@ package body Ghdllocal is
       end if;
       Flags.Bootstrap := True;
       Libraries.Load_Std_Library;
-      Disp_Vhdl.Disp_Vhdl (Std_Package.Std_Standard_Unit);
+      Vhdl.Disp_Vhdl.Disp_Vhdl (Std_Package.Std_Standard_Unit);
    end Perform_Action;
 
    --  Command --find-top.
diff --git a/src/ghdldrv/ghdlprint.adb b/src/ghdldrv/ghdlprint.adb
index 7156be9e9..231f156ac 100644
--- a/src/ghdldrv/ghdlprint.adb
+++ b/src/ghdldrv/ghdlprint.adb
@@ -36,7 +36,7 @@ with Xrefs;
 with Sem_Lib; use Sem_Lib;
 with Ghdlmain; use Ghdlmain;
 with Ghdllocal; use Ghdllocal;
-with Disp_Vhdl;
+with Vhdl.Disp_Vhdl;
 with Elocations;
 
 package body Ghdlprint is
@@ -1006,7 +1006,7 @@ package body Ghdlprint is
 
             Next_Unit := Get_Chain (Unit);
             if Errorout.Nbr_Errors = 0 then
-               Disp_Vhdl.Disp_Vhdl (Unit);
+               Vhdl.Disp_Vhdl.Disp_Vhdl (Unit);
                Set_Chain (Unit, Null_Iir);
                Libraries.Add_Design_Unit_Into_Library (Unit);
             end if;
diff --git a/src/ghdldrv/ghdlxml.adb b/src/ghdldrv/ghdlxml.adb
index aaf5fb58b..32cbadb13 100644
--- a/src/ghdldrv/ghdlxml.adb
+++ b/src/ghdldrv/ghdlxml.adb
@@ -21,7 +21,7 @@ with Types; use Types;
 with Name_Table; use Name_Table;
 with Nodes_Meta; use Nodes_Meta;
 with Files_Map;
-with Disp_Tree; use Disp_Tree;
+with Vhdl.Disp_Tree; use Vhdl.Disp_Tree;
 with Ghdlprint; use Ghdlprint;
 with Libraries;
 with Errorout; use Errorout;
diff --git a/src/options.adb b/src/options.adb
index e2da44919..f7336c585 100644
--- a/src/options.adb
+++ b/src/options.adb
@@ -22,7 +22,7 @@ with Libraries;
 with Std_Names;
 with PSL.Nodes;
 with PSL.Dump_Tree;
-with Disp_Tree;
+with Vhdl.Disp_Tree;
 with Vhdl.Scanner;
 with Back_End; use Back_End;
 with Flags; use Flags;
@@ -34,7 +34,7 @@ package body Options is
       Std_Names.Std_Names_Initialize;
       Libraries.Init_Paths;
       PSL.Nodes.Init;
-      PSL.Dump_Tree.Dump_Hdl_Node := Disp_Tree.Disp_Tree_For_Psl'Access;
+      PSL.Dump_Tree.Dump_Hdl_Node := Vhdl.Disp_Tree.Disp_Tree_For_Psl'Access;
    end Initialize;
 
    function Option_Warning (Opt: String; Val : Boolean) return Boolean is
diff --git a/src/vhdl/nodes_gc.adb b/src/vhdl/nodes_gc.adb
index 6cf12647f..1ee3696ab 100644
--- a/src/vhdl/nodes_gc.adb
+++ b/src/vhdl/nodes_gc.adb
@@ -23,7 +23,7 @@ with Nodes;
 with Nodes_Meta; use Nodes_Meta;
 with Errorout; use Errorout;
 with Libraries;
-with Disp_Tree;
+with Vhdl.Disp_Tree;
 with Std_Package;
 
 package body Nodes_GC is
@@ -43,14 +43,14 @@ package body Nodes_GC is
       Log ("early reference to ");
       Log (Nodes_Meta.Get_Field_Image (F));
       Log (" in ");
-      Disp_Tree.Disp_Tree (N, True);
+      Vhdl.Disp_Tree.Disp_Tree (N, True);
       Has_Error := True;
    end Report_Early_Reference;
 
    procedure Report_Already_Marked (N : Iir) is
    begin
       Log ("Already marked ");
-      Disp_Tree.Disp_Tree (N, True);
+      Vhdl.Disp_Tree.Disp_Tree (N, True);
       Has_Error := True;
    end Report_Already_Marked;
 
@@ -177,7 +177,7 @@ package body Nodes_GC is
 
    procedure Report_Unreferenced_Node (N : Iir) is
    begin
-      Disp_Tree.Disp_Tree (N, True);
+      Vhdl.Disp_Tree.Disp_Tree (N, True);
       Has_Error := True;
    end Report_Unreferenced_Node;
 
diff --git a/src/vhdl/sem_lib.adb b/src/vhdl/sem_lib.adb
index afc54cbf3..8e4ec6e21 100644
--- a/src/vhdl/sem_lib.adb
+++ b/src/vhdl/sem_lib.adb
@@ -23,8 +23,8 @@ with Errorout; use Errorout;
 with Libraries; use Libraries;
 with Vhdl.Scanner;
 with Vhdl.Parse;
-with Disp_Tree;
-with Disp_Vhdl;
+with Vhdl.Disp_Tree;
+with Vhdl.Disp_Vhdl;
 with Sem;
 with Post_Sems;
 with Canon;
@@ -80,7 +80,7 @@ package body Sem_Lib is
    begin
       Lib_Unit := Get_Library_Unit (Unit);
       if (Main or Flags.Dump_All) and then Flags.Dump_Parse then
-         Disp_Tree.Disp_Tree (Unit);
+         Vhdl.Disp_Tree.Disp_Tree (Unit);
       end if;
 
       if Flags.Check_Ast_Level > 0 then
@@ -95,7 +95,7 @@ package body Sem_Lib is
       Sem.Semantic (Unit);
 
       if (Main or Flags.Dump_All) and then Flags.Dump_Sem then
-         Disp_Tree.Disp_Tree (Unit);
+         Vhdl.Disp_Tree.Disp_Tree (Unit);
       end if;
 
       if Errorout.Nbr_Errors > 0 then
@@ -103,7 +103,7 @@ package body Sem_Lib is
       end if;
 
       if (Main or Flags.List_All) and then Flags.List_Sem then
-         Disp_Vhdl.Disp_Vhdl (Unit);
+         Vhdl.Disp_Vhdl.Disp_Vhdl (Unit);
       end if;
 
       if Flags.Check_Ast_Level > 0 then
@@ -130,7 +130,7 @@ package body Sem_Lib is
       Canon.Canonicalize (Unit);
 
       if (Main or Flags.Dump_All) and then Flags.Dump_Canon then
-         Disp_Tree.Disp_Tree (Unit);
+         Vhdl.Disp_Tree.Disp_Tree (Unit);
       end if;
 
       if Errorout.Nbr_Errors > 0 then
@@ -138,7 +138,7 @@ package body Sem_Lib is
       end if;
 
       if (Main or Flags.List_All) and then Flags.List_Canon then
-         Disp_Vhdl.Disp_Vhdl (Unit);
+         Vhdl.Disp_Vhdl.Disp_Vhdl (Unit);
       end if;
 
       if Flags.Check_Ast_Level > 0 then
diff --git a/src/vhdl/simulate/simul-debugger-ams.adb b/src/vhdl/simulate/simul-debugger-ams.adb
index 2c7c86316..ab4cfa36b 100644
--- a/src/vhdl/simulate/simul-debugger-ams.adb
+++ b/src/vhdl/simulate/simul-debugger-ams.adb
@@ -18,7 +18,7 @@
 
 with Iirs_Utils; use Iirs_Utils;
 with Ada.Text_IO; use Ada.Text_IO;
-with Disp_Vhdl;
+with Vhdl.Disp_Vhdl;
 
 package body Simul.Debugger.AMS is
    procedure Disp_Quantity_Name (Quantity : Quantity_Index_Type)
@@ -46,7 +46,7 @@ package body Simul.Debugger.AMS is
          when Op_Quantity =>
             Disp_Quantity_Name (Term.Quantity);
          when Op_Vhdl_Expr =>
-            Disp_Vhdl.Disp_Expression (Term.Vhdl_Expr);
+            Vhdl.Disp_Vhdl.Disp_Expression (Term.Vhdl_Expr);
       end case;
    end Disp_Term;
 
diff --git a/src/vhdl/simulate/simul-debugger.adb b/src/vhdl/simulate/simul-debugger.adb
index 82eec793e..c43c96df9 100644
--- a/src/vhdl/simulate/simul-debugger.adb
+++ b/src/vhdl/simulate/simul-debugger.adb
@@ -37,7 +37,7 @@ with Simul.Elaboration; use Simul.Elaboration;
 with Simul.Execution; use Simul.Execution;
 with Iirs_Utils; use Iirs_Utils;
 with Errorout; use Errorout;
-with Disp_Vhdl;
+with Vhdl.Disp_Vhdl;
 with Iirs_Walk; use Iirs_Walk;
 with Areapools; use Areapools;
 with Grt.Types; use Grt.Types;
@@ -1521,7 +1521,7 @@ package body Simul.Debugger is
             Put ('.');
             Put (Name_Table.Image (Get_Identifier (E.Stmt)));
             New_Line;
-            Disp_Vhdl.Disp_PSL_NFA (Get_PSL_NFA (E.Stmt));
+            Vhdl.Disp_Vhdl.Disp_PSL_NFA (Get_PSL_NFA (E.Stmt));
             Put ("    01234567890123456789012345678901234567890123456789");
             for I in E.States'Range loop
                if I mod 50 = 0 then
@@ -1925,7 +1925,7 @@ package body Simul.Debugger is
          return;
       end if;
 
-      Disp_Vhdl.Disp_Expression (Expr);
+      Vhdl.Disp_Vhdl.Disp_Expression (Expr);
       New_Line;
 
       Annotate_Expand_Table;
diff --git a/src/vhdl/translate/trans_analyzes.adb b/src/vhdl/translate/trans_analyzes.adb
index 09c822d2f..3ad9c3e25 100644
--- a/src/vhdl/translate/trans_analyzes.adb
+++ b/src/vhdl/translate/trans_analyzes.adb
@@ -18,7 +18,7 @@
 
 with Iirs_Utils; use Iirs_Utils;
 with Iirs_Walk; use Iirs_Walk;
-with Disp_Vhdl;
+with Vhdl.Disp_Vhdl;
 with Ada.Text_IO;
 with Errorout;
 
@@ -246,7 +246,7 @@ package body Trans_Analyzes is
          else
             Put ("   ");
          end if;
-         Disp_Vhdl.Disp_Vhdl (El);
+         Vhdl.Disp_Vhdl.Disp_Vhdl (El);
          New_Line;
          Next (It);
       end loop;
diff --git a/src/vhdl/disp_tree.adb b/src/vhdl/vhdl-disp_tree.adb
index d5b1cc8a8..d214957aa 100644
--- a/src/vhdl/disp_tree.adb
+++ b/src/vhdl/vhdl-disp_tree.adb
@@ -28,7 +28,7 @@ with Nodes_Meta;
 --  Do not add a use clause for iirs_utils, as it may crash for ill-formed
 --  trees, which is annoying while debugging.
 
-package body Disp_Tree is
+package body Vhdl.Disp_Tree is
    --  Max depth for Disp_Iir.  Can be modified from a debugger.
    pragma Warnings (Off);
    Max_Depth : Natural := 10;
@@ -601,4 +601,4 @@ package body Disp_Tree is
          Disp_Iir (Tree, 1, Max_Depth);
       end if;
    end Disp_Tree;
-end Disp_Tree;
+end Vhdl.Disp_Tree;
diff --git a/src/vhdl/disp_tree.ads b/src/vhdl/vhdl-disp_tree.ads
index 324094008..72aca5827 100644
--- a/src/vhdl/disp_tree.ads
+++ b/src/vhdl/vhdl-disp_tree.ads
@@ -19,7 +19,7 @@ with Types; use Types;
 with Iirs; use Iirs;
 with Vhdl.Tokens; use Vhdl.Tokens;
 
-package Disp_Tree is
+package Vhdl.Disp_Tree is
    --  Disp TREE recursively.
    procedure Disp_Tree (Tree : Iir; Flat : Boolean := False);
 
@@ -50,4 +50,4 @@ package Disp_Tree is
    function Image_Iir_Direction (Dir : Iir_Direction) return String;
    function Image_Token_Type (Tok : Vhdl.Tokens.Token_Type) return String;
    function Image_String8 (N : Iir) return String;
-end Disp_Tree;
+end Vhdl.Disp_Tree;
diff --git a/src/vhdl/disp_vhdl.adb b/src/vhdl/vhdl-disp_vhdl.adb
index ea3fc34be..f905a171a 100644
--- a/src/vhdl/disp_vhdl.adb
+++ b/src/vhdl/vhdl-disp_vhdl.adb
@@ -33,7 +33,7 @@ with PSL.Nodes;
 with PSL.Prints;
 with PSL.NFAs;
 
-package body Disp_Vhdl is
+package body Vhdl.Disp_Vhdl is
 
    subtype Count is Positive;
 
@@ -3613,4 +3613,4 @@ package body Disp_Vhdl is
          Put (Str);
       end if;
    end Disp_Fp64;
-end Disp_Vhdl;
+end Vhdl.Disp_Vhdl;
diff --git a/src/vhdl/disp_vhdl.ads b/src/vhdl/vhdl-disp_vhdl.ads
index 9f04129bc..cdf5528ba 100644
--- a/src/vhdl/disp_vhdl.ads
+++ b/src/vhdl/vhdl-disp_vhdl.ads
@@ -18,7 +18,7 @@
 with Types; use Types;
 with Iirs; use Iirs;
 
-package Disp_Vhdl is
+package Vhdl.Disp_Vhdl is
    -- General procedure to display a node.
    -- Mainly used to dispatch to other functions according to the kind of
    -- the node.
@@ -37,4 +37,4 @@ package Disp_Vhdl is
 
    -- Disp an iir_Fp64, without the leading blank.
    procedure Disp_Fp64 (Val: Iir_Fp64);
-end Disp_Vhdl;
+end Vhdl.Disp_Vhdl;