diff options
| -rw-r--r-- | src/libraries.adb | 19 | ||||
| -rw-r--r-- | src/vhdl/iirs.adb | 15 | ||||
| -rw-r--r-- | src/vhdl/iirs.adb.in | 15 |
3 files changed, 23 insertions, 26 deletions
diff --git a/src/libraries.adb b/src/libraries.adb index 3ae9f7e25..cf2d68da6 100644 --- a/src/libraries.adb +++ b/src/libraries.adb @@ -15,11 +15,11 @@ -- 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 Ada.Text_IO; use Ada.Text_IO; -with Tables; -with GNAT.OS_Lib; with Interfaces.C_Streams; with System; +with GNAT.OS_Lib; +with Logging; use Logging; +with Tables; with Errorout; use Errorout; with Scanner; with Iirs_Utils; use Iirs_Utils; @@ -380,7 +380,7 @@ package body Libraries is pragma Assert (Get_Design_File_Chain (Library) = Null_Iir); if Trace_Library_Load then - Ada.Text_IO.Put_Line ("Load library " & Image (Lib_Ident)); + Log_Line ("Load library " & Image (Lib_Ident)); end if; -- Try to open the library file map. @@ -397,8 +397,7 @@ package body Libraries is File_Id := Get_Identifier (Library_To_File_Name (Library)); if Trace_Library_Load then - Ada.Text_IO.Put_Line - (" from " & Image (Dir) & Image (File_Id)); + Log_Line (" from " & Image (Dir) & Image (File_Id)); end if; File := Files_Map.Read_Source_File (Dir, File_Id); @@ -500,7 +499,7 @@ package body Libraries is or else Get_Kind (Library_Unit) /= Iir_Kind_Architecture_Body then - Put_Line ("load_library: invalid use of 'with'"); + Log_Line ("load_library: invalid use of 'with'"); raise Internal_Error; end if; Scan_Expect (Tok_Configuration); @@ -512,7 +511,7 @@ package body Libraries is Create_Iir (Iir_Kind_Context_Declaration); Scan; when others => - Put_Line + Log_Line ("load_library: line must start with " & "'architecture', 'entity', 'package' or 'configuration'"); raise Internal_Error; @@ -558,8 +557,8 @@ package body Libraries is Scan; if False then - Put_Line ("line:" & Int32'Image (Line) - & ", pos:" & Source_Ptr'Image (Pos)); + Log_Line ("line:" & Int32'Image (Line) + & ", pos:" & Source_Ptr'Image (Pos)); end if; -- Keep the position of the design unit. diff --git a/src/vhdl/iirs.adb b/src/vhdl/iirs.adb index aa7c067c1..cb72b4699 100644 --- a/src/vhdl/iirs.adb +++ b/src/vhdl/iirs.adb @@ -16,7 +16,7 @@ -- Software Foundation, 59 Temple Place - Suite 330, Boston, MA -- 02111-1307, USA. with Ada.Unchecked_Conversion; -with Ada.Text_IO; +with Logging; use Logging; with Nodes; use Nodes; with Lists; use Lists; with Nodes_Meta; use Nodes_Meta; @@ -57,7 +57,6 @@ package body Iirs is -- Statistics. procedure Disp_Stats is - use Ada.Text_IO; type Num_Array is array (Iir_Kind) of Natural; Num : Num_Array := (others => 0); type Format_Array is array (Format_Type) of Natural; @@ -77,17 +76,17 @@ package body Iirs is I := Next_Node (I); end loop; - Put_Line ("Stats per iir_kind:"); + Log_Line ("Stats per iir_kind:"); for J in Iir_Kind loop if Num (J) /= 0 then - Put_Line (' ' & Iir_Kind'Image (J) & ':' - & Natural'Image (Num (J))); + Log_Line (' ' & Iir_Kind'Image (J) & ':' + & Natural'Image (Num (J))); end if; end loop; - Put_Line ("Stats per formats:"); + Log_Line ("Stats per formats:"); for J in Format_Type loop - Put_Line (' ' & Format_Type'Image (J) & ':' - & Natural'Image (Formats (J))); + Log_Line (' ' & Format_Type'Image (J) & ':' + & Natural'Image (Formats (J))); end loop; end Disp_Stats; diff --git a/src/vhdl/iirs.adb.in b/src/vhdl/iirs.adb.in index 8243f145f..293cd7254 100644 --- a/src/vhdl/iirs.adb.in +++ b/src/vhdl/iirs.adb.in @@ -16,7 +16,7 @@ -- Software Foundation, 59 Temple Place - Suite 330, Boston, MA -- 02111-1307, USA. with Ada.Unchecked_Conversion; -with Ada.Text_IO; +with Logging; use Logging; with Nodes; use Nodes; with Lists; use Lists; with Nodes_Meta; use Nodes_Meta; @@ -57,7 +57,6 @@ package body Iirs is -- Statistics. procedure Disp_Stats is - use Ada.Text_IO; type Num_Array is array (Iir_Kind) of Natural; Num : Num_Array := (others => 0); type Format_Array is array (Format_Type) of Natural; @@ -77,17 +76,17 @@ package body Iirs is I := Next_Node (I); end loop; - Put_Line ("Stats per iir_kind:"); + Log_Line ("Stats per iir_kind:"); for J in Iir_Kind loop if Num (J) /= 0 then - Put_Line (' ' & Iir_Kind'Image (J) & ':' - & Natural'Image (Num (J))); + Log_Line (' ' & Iir_Kind'Image (J) & ':' + & Natural'Image (Num (J))); end if; end loop; - Put_Line ("Stats per formats:"); + Log_Line ("Stats per formats:"); for J in Format_Type loop - Put_Line (' ' & Format_Type'Image (J) & ':' - & Natural'Image (Formats (J))); + Log_Line (' ' & Format_Type'Image (J) & ':' + & Natural'Image (Formats (J))); end loop; end Disp_Stats; |