diff options
| author | Tristan Gingold <tgingold@free.fr> | 2019-07-22 03:31:07 +0200 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2019-07-22 07:32:57 +0200 |
| commit | 654af3d66369926159fb763cfaadf7ba8bc13d44 (patch) | |
| tree | eed9c235c2cb0c6b3ace9dd742943bd992946689 /src/vhdl | |
| parent | 13f04d9fbf5ca617b9f0cef692556c5639b0033e (diff) | |
| download | ghdl-654af3d66369926159fb763cfaadf7ba8bc13d44.tar.gz ghdl-654af3d66369926159fb763cfaadf7ba8bc13d44.tar.bz2 ghdl-654af3d66369926159fb763cfaadf7ba8bc13d44.zip | |
vhdl-prints: improve output for ports/generics.
Diffstat (limited to 'src/vhdl')
| -rw-r--r-- | src/vhdl/vhdl-prints.adb | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/src/vhdl/vhdl-prints.adb b/src/vhdl/vhdl-prints.adb index 46e12a2e3..16f9e0e37 100644 --- a/src/vhdl/vhdl-prints.adb +++ b/src/vhdl/vhdl-prints.adb @@ -1114,7 +1114,8 @@ package body Vhdl.Prints is end Disp_Interface_Mode_And_Type; -- Disp interfaces, followed by END_STR (';' in general). - procedure Disp_Interface_Chain (Ctxt : in out Ctxt_Class; Chain: Iir) + procedure Disp_Interface_Chain + (Ctxt : in out Ctxt_Class; Chain: Iir; With_Box : Boolean) is Inter: Iir; Next_Inter : Iir; @@ -1125,12 +1126,21 @@ package body Vhdl.Prints is end if; Disp_Token (Ctxt, Tok_Left_Paren); + if With_Box then + Close_Hbox (Ctxt); + Start_Vbox (Ctxt); + end if; + Inter := Chain; loop Next_Inter := Get_Chain (Inter); First_Inter := Inter; + if With_Box then + Start_Hbox (Ctxt); + end if; + case Get_Kind (Inter) is when Iir_Kinds_Interface_Object_Declaration => Disp_Interface_Class (Ctxt, Inter); @@ -1169,13 +1179,25 @@ package body Vhdl.Prints is Error_Kind ("disp_interface_chain", Inter); end case; + if Next_Inter /= Null_Iir then + Disp_Token (Ctxt, Tok_Semi_Colon); + end if; + + if With_Box then + Close_Hbox (Ctxt); + end if; + exit when Next_Inter = Null_Iir; - Disp_Token (Ctxt, Tok_Semi_Colon); Inter := Next_Inter; Next_Inter := Get_Chain (Inter); end loop; + if With_Box then + Close_Vbox (Ctxt); + Start_Hbox (Ctxt); + end if; + Disp_Token (Ctxt, Tok_Right_Paren); end Disp_Interface_Chain; @@ -1186,7 +1208,7 @@ package body Vhdl.Prints is if Ports /= Null_Iir then Start_Hbox (Ctxt); Disp_Token (Ctxt, Tok_Port); - Disp_Interface_Chain (Ctxt, Ports); + Disp_Interface_Chain (Ctxt, Ports, True); Disp_Token (Ctxt, Tok_Semi_Colon); Close_Hbox (Ctxt); end if; @@ -1199,7 +1221,7 @@ package body Vhdl.Prints is if Generics /= Null_Iir then Start_Hbox (Ctxt); Disp_Token (Ctxt, Tok_Generic); - Disp_Interface_Chain (Ctxt, Generics); + Disp_Interface_Chain (Ctxt, Generics, True); Disp_Token (Ctxt, Tok_Semi_Colon); Close_Hbox (Ctxt); end if; @@ -1551,7 +1573,7 @@ package body Vhdl.Prints is end if; Inter := Get_Interface_Declaration_Chain (Subprg); - Disp_Interface_Chain (Ctxt, Inter); + Disp_Interface_Chain (Ctxt, Inter, False); case Get_Kind (Subprg) is when Iir_Kind_Function_Declaration |