Add simple_IO - to be used instead of Text_IO.

8 files changed, 41 insertions, 44 deletions

diff --git a/src/ghdldrv/ghdlcomp.adb b/src/ghdldrv/ghdlcomp.adb
index 542042819..cee8f037e 100644
--- a/src/ghdldrv/ghdlcomp.adb
+++ b/src/ghdldrv/ghdlcomp.adb
@@ -19,9 +19,8 @@ with Ghdlmain; use Ghdlmain;
 with Ghdllocal; use Ghdllocal;
 
 with Ada.Command_Line;
-with Ada.Characters.Latin_1;
-with Ada.Text_IO;
 
+with Simple_IO;
 with Types;
 with Flags;
 with Vhdl.Sem;
@@ -97,7 +96,7 @@ package body Ghdlcomp is
 
    procedure Disp_Long_Help (Cmd : Command_Comp)
    is
-      use Ada.Text_IO;
+      use Simple_IO;
    begin
       Disp_Long_Help (Command_Lib (Cmd));
       Hooks.Disp_Long_Help.all;
@@ -600,7 +599,7 @@ package body Ghdlcomp is
 
    procedure Disp_Config
    is
-      use Ada.Text_IO;
+      use Simple_IO;
       use Libraries;
    begin
       Disp_Config_Prefixes;
@@ -616,7 +615,7 @@ package body Ghdlcomp is
                              Args : Argument_List)
    is
       pragma Unreferenced (Cmd);
-      use Ada.Text_IO;
+      use Simple_IO;
    begin
       if Args'Length /= 0 then
          Error ("--disp-config does not accept any argument");
@@ -789,11 +788,11 @@ package body Ghdlcomp is
    is
       pragma Unreferenced (Cmd);
       use Types;
-      use Ada.Text_IO;
+      use Simple_IO;
       use Ada.Command_Line;
       use Name_Table;
 
-      HT : constant Character := Ada.Characters.Latin_1.HT;
+      HT : constant Character := ASCII.HT;
       Files_List : Iir_List;
       File : Iir_Design_File;
       Files_It : List_Iterator;
diff --git a/src/ghdldrv/ghdldrv.adb b/src/ghdldrv/ghdldrv.adb
index d8e9534fc..cd810647f 100644
--- a/src/ghdldrv/ghdldrv.adb
+++ b/src/ghdldrv/ghdldrv.adb
@@ -16,11 +16,12 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 with Ada.Command_Line; use Ada.Command_Line;
-with Ada.Text_IO; use Ada.Text_IO;
 with Ada.Characters.Latin_1;
 with GNAT.OS_Lib; use GNAT.OS_Lib;
-with Tables;
 with GNAT.Dynamic_Tables;
+
+with Tables;
+with Simple_IO; use Simple_IO;
 with Libraries;
 with Name_Table; use Name_Table;
 with Vhdl.Std_Package;
diff --git a/src/ghdldrv/ghdllocal.adb b/src/ghdldrv/ghdllocal.adb
index e5fe38401..3aee26250 100644
--- a/src/ghdldrv/ghdllocal.adb
+++ b/src/ghdldrv/ghdllocal.adb
@@ -15,9 +15,11 @@
 --  along with GCC; 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 Ada.Command_Line;
 with GNAT.Directory_Operations;
+
+with Simple_IO; use Simple_IO;
 with Types; use Types;
 with Libraries;
 with Vhdl.Sem_Lib;
diff --git a/src/ghdldrv/ghdlmain.adb b/src/ghdldrv/ghdlmain.adb
index 02e01cc1b..932228b51 100644
--- a/src/ghdldrv/ghdlmain.adb
+++ b/src/ghdldrv/ghdlmain.adb
@@ -15,9 +15,10 @@
 --  along with GCC; 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;
 with Ada.Command_Line;
 with Ada.Command_Line.Response_File;
+
+with Simple_IO;
 with Version;
 with Bug;
 with Options;
@@ -47,7 +48,7 @@ package body Ghdlmain is
    procedure Disp_Long_Help (Cmd : Command_Type)
    is
       pragma Unreferenced (Cmd);
-      use Ada.Text_IO;
+      use Simple_IO;
    begin
       Put_Line ("This command does not accept options.");
    end Disp_Long_Help;
@@ -121,7 +122,7 @@ package body Ghdlmain is
    is
       pragma Unreferenced (Cmd);
 
-      use Ada.Text_IO;
+      use Simple_IO;
       use Ada.Command_Line;
       C : Command_Acc;
    begin
@@ -222,7 +223,7 @@ package body Ghdlmain is
                              Args : Argument_List)
    is
       pragma Unreferenced (Cmd);
-      use Ada.Text_IO;
+      use Simple_IO;
    begin
       Put ("GHDL ");
       Put (Version.Ghdl_Ver);
diff --git a/src/ghdldrv/ghdlrun.adb b/src/ghdldrv/ghdlrun.adb
index a781d3ec9..1305ad28a 100644
--- a/src/ghdldrv/ghdlrun.adb
+++ b/src/ghdldrv/ghdlrun.adb
@@ -19,14 +19,14 @@ with System; use System;
 
 with Ada.Unchecked_Conversion;
 with Ada.Command_Line;
-with Ada.Text_IO;
+with GNAT.OS_Lib; use GNAT.OS_Lib;
 
 with Interfaces;
 with Interfaces.C;
 
 with Ghdlmain; use Ghdlmain;
 with Ghdllocal; use Ghdllocal;
-with GNAT.OS_Lib; use GNAT.OS_Lib;
+with Simple_IO; use Simple_IO;
 
 with Ortho_Jit;
 with Ortho_Nodes; use Ortho_Nodes;
@@ -178,21 +178,17 @@ package body Ghdlrun is
             Time_Resolution := 'f';
          end if;
          if Flag_Verbose then
-            declare
-               use Ada.Text_IO;
-            begin
-               Put ("Time resolution is 1 ");
-               case Time_Resolution is
-                  when 'f' => Put ("fs");
-                  when 'p' => Put ("ps");
-                  when 'n' => Put ("ns");
-                  when 'u' => Put ("us");
-                  when 'm' => Put ("ms");
-                  when 's' => Put ("sec");
-                  when others => Put ("??");
-               end case;
-               New_Line;
-            end;
+            Put ("Time resolution is 1 ");
+            case Time_Resolution is
+               when 'f' => Put ("fs");
+               when 'p' => Put ("ps");
+               when 'n' => Put ("ns");
+               when 'u' => Put ("us");
+               when 'm' => Put ("ms");
+               when 's' => Put ("sec");
+               when others => Put ("??");
+            end case;
+            New_Line;
          end if;
       end if;
       Vhdl.Std_Package.Set_Time_Resolution (Time_Resolution);
@@ -256,7 +252,6 @@ package body Ghdlrun is
 
    procedure Ghdl_Elaborate is
    begin
-      --Ada.Text_IO.Put_Line (Standard_Error, "ghdl_elaborate");
       Elaborate_Proc.all;
    end Ghdl_Elaborate;
 
@@ -347,7 +342,7 @@ package body Ghdlrun is
       Decl : O_Dnode;
    begin
       if Flag_Verbose then
-         Ada.Text_IO.Put_Line ("Linking in memory");
+         Put_Line ("Linking in memory");
       end if;
 
       Def (Trans_Decls.Ghdl_Memcpy,
@@ -764,7 +759,7 @@ package body Ghdlrun is
       Name_Table.Finalize;
 
       if Flag_Verbose then
-         Ada.Text_IO.Put_Line ("Starting simulation");
+         Put_Line ("Starting simulation");
       end if;
 
       Grt.Main.Run;
@@ -801,11 +796,9 @@ package body Ghdlrun is
                              Args : Argument_List)
    is
       pragma Unreferenced (Cmd);
-      use Ada.Text_IO;
    begin
       if Args'Length /= 0 then
-         Error
-           ("warning: command '--run-help' does not accept any argument");
+         Error ("warning: command '--run-help' does not accept any argument");
       end if;
       Put_Line ("These options can only be placed at [RUNOPTS]");
       --  Register modules, since they add commands.
diff --git a/src/ghdldrv/ghdlsimul.adb b/src/ghdldrv/ghdlsimul.adb
index e3c9ced5b..a37424409 100644
--- a/src/ghdldrv/ghdlsimul.adb
+++ b/src/ghdldrv/ghdlsimul.adb
@@ -16,12 +16,12 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 
-with Ada.Text_IO;
 with Ada.Command_Line;
 
 with Ghdllocal; use Ghdllocal;
 with GNAT.OS_Lib; use GNAT.OS_Lib;
 
+with Simple_IO;
 with Types;
 with Flags;
 with Name_Table;
@@ -206,11 +206,9 @@ package body Ghdlsimul is
       return True;
    end Decode_Option;
 
-   procedure Disp_Long_Help
-   is
-      use Ada.Text_IO;
+   procedure Disp_Long_Help is
    begin
-      Put_Line (" --debug        Run with debugger");
+      Simple_IO.Put_Line (" --debug        Run with debugger");
    end Disp_Long_Help;
 
    function Get_Top_Config return Iir is
diff --git a/src/ghdldrv/ghdlvpi.adb b/src/ghdldrv/ghdlvpi.adb
index 4c25896ea..e2e142d6a 100644
--- a/src/ghdldrv/ghdlvpi.adb
+++ b/src/ghdldrv/ghdlvpi.adb
@@ -16,9 +16,10 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 
-with Ada.Text_IO; use Ada.Text_IO;
 with GNAT.OS_Lib; use GNAT.OS_Lib;
 with Ada.Command_Line; use Ada.Command_Line;
+with Simple_IO; use Simple_IO;
+
 with Ghdlmain; use Ghdlmain;
 with Ghdllocal;
 with Default_Paths; use Default_Paths;
diff --git a/src/ghdldrv/ghdlxml.adb b/src/ghdldrv/ghdlxml.adb
index c55e0c30e..10e1644ef 100644
--- a/src/ghdldrv/ghdlxml.adb
+++ b/src/ghdldrv/ghdlxml.adb
@@ -15,8 +15,10 @@
 --  along with GCC; 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 GNAT.OS_Lib; use GNAT.OS_Lib;
+with Simple_IO; use Simple_IO;
+
 with Types; use Types;
 with Name_Table; use Name_Table;
 with Vhdl.Nodes_Meta; use Vhdl.Nodes_Meta;