diff options
| author | Tristan Gingold <tgingold@free.fr> | 2016-02-07 07:29:38 +0100 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2016-02-09 20:25:02 +0100 |
| commit | 5ddefe0ca2f02afdb7a10717b9feb77a42fbc901 (patch) | |
| tree | 6203c06742e2e00b75ccdc40b56945c5305c738a /src/vhdl | |
| parent | f5130442c175e7308e26b092dcebd0c6901e4881 (diff) | |
| download | ghdl-5ddefe0ca2f02afdb7a10717b9feb77a42fbc901.tar.gz ghdl-5ddefe0ca2f02afdb7a10717b9feb77a42fbc901.tar.bz2 ghdl-5ddefe0ca2f02afdb7a10717b9feb77a42fbc901.zip | |
Improve mixed dump of PSL and VHDL nodes.
Diffstat (limited to 'src/vhdl')
| -rw-r--r-- | src/vhdl/disp_tree.adb | 24 | ||||
| -rw-r--r-- | src/vhdl/disp_tree.ads | 6 |
2 files changed, 16 insertions, 14 deletions
diff --git a/src/vhdl/disp_tree.adb b/src/vhdl/disp_tree.adb index a56198ac9..d506ae23f 100644 --- a/src/vhdl/disp_tree.adb +++ b/src/vhdl/disp_tree.adb @@ -290,15 +290,15 @@ package body Disp_Tree is return Iir_Predefined_Functions'Image (F); end Image_Iir_Predefined_Functions; - procedure Disp_PSL_Node (N : PSL_Node; Indent : Natural) is - begin - Put_Indent (Indent); - PSL.Dump_Tree.Dump_Tree (N, True); - end Disp_PSL_Node; - - procedure Disp_PSL_NFA (N : PSL_NFA; Indent : Natural) is + procedure Disp_PSL_NFA (N : PSL_NFA; Indent : Natural) + is + pragma Unreferenced (Indent); begin - null; + if N = 0 then + Put_Line ("*null*"); + else + Put_Line ("*??*"); + end if; end Disp_PSL_NFA; function Image_Location_Type (Loc : Location_Type) return String is @@ -421,7 +421,8 @@ package body Disp_Tree is when Type_String8_Id => Put_Line ("<string8>"); when Type_PSL_Node => - Disp_PSL_Node (Get_PSL_Node (N, F), Sub_Indent); + PSL.Dump_Tree.Disp_Tree + (Get_PSL_Node (N, F), Sub_Indent, Depth - 1); when Type_Source_Ptr => Put_Line (Source_Ptr'Image (Get_Source_Ptr (N, F))); when Type_Date_Type => @@ -491,9 +492,10 @@ package body Disp_Tree is end; end Disp_Iir; - procedure Disp_Tree_For_Psl (N : Int32) is + procedure Disp_Tree_For_Psl + (N : Int32; Indent : Natural; Depth : Natural) is begin - Disp_Iir (Iir (N), 1, 0); + Disp_Iir (Iir (N), Indent, Depth); end Disp_Tree_For_Psl; procedure Disp_Tree (Tree : Iir; diff --git a/src/vhdl/disp_tree.ads b/src/vhdl/disp_tree.ads index 94b1d29e3..f30c6278f 100644 --- a/src/vhdl/disp_tree.ads +++ b/src/vhdl/disp_tree.ads @@ -20,8 +20,8 @@ with Iirs; use Iirs; package Disp_Tree is -- Disp TREE recursively. - procedure Disp_Tree (Tree : Iir; - Flat : Boolean := False); + procedure Disp_Tree (Tree : Iir; Flat : Boolean := False); - procedure Disp_Tree_For_Psl (N : Int32); + procedure Disp_Tree_For_Psl + (N : Int32; Indent : Natural; Depth : Natural); end Disp_Tree; |