Add simple_IO - to be used instead of Text_IO.

4 files changed, 11 insertions, 18 deletions

diff --git a/src/vhdl/translate/trans-chap7.adb b/src/vhdl/translate/trans-chap7.adb
index 9d1e0796c..3d670cf56 100644
--- a/src/vhdl/translate/trans-chap7.adb
+++ b/src/vhdl/translate/trans-chap7.adb
@@ -16,7 +16,7 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 
-with Ada.Text_IO;
+with Simple_IO;
 with Name_Table;
 with Str_Table;
 with Vhdl.Utils; use Vhdl.Utils;
@@ -1132,10 +1132,7 @@ package body Trans.Chap7 is
             Invert := True;
             Val := 0;
          when others =>
-            Ada.Text_IO.Put_Line
-              ("translate_shortcut_operator: cannot handle "
-               & Iir_Predefined_Functions'Image (Kind));
-            raise Internal_Error;
+            Error_Kind ("translate_shortcut_operator", Kind);
       end case;
 
       V := Get_Ortho_Literal
@@ -2334,7 +2331,7 @@ package body Trans.Chap7 is
                | ON_Not =>
                Res := New_Monadic_Op (Op, Left_Tree);
             when others =>
-               Ada.Text_IO.Put_Line
+               Simple_IO.Put_Line_Err
                  ("translate_predefined_operator: cannot handle "
                   & ON_Op_Kind'Image (Op));
                raise Internal_Error;
@@ -2747,11 +2744,7 @@ package body Trans.Chap7 is
             end;
 
          when others =>
-            Ada.Text_IO.Put_Line
-              ("translate_predefined_operator(2): cannot handle "
-               & Iir_Predefined_Functions'Image (Kind));
-            raise Internal_Error;
-            return O_Enode_Null;
+            Error_Kind ("translate_predefined_operator(2)", Kind);
       end case;
    end Translate_Predefined_Operator;
 
diff --git a/src/vhdl/translate/trans-chap8.adb b/src/vhdl/translate/trans-chap8.adb
index d1bd4b085..83cfb0935 100644
--- a/src/vhdl/translate/trans-chap8.adb
+++ b/src/vhdl/translate/trans-chap8.adb
@@ -16,7 +16,7 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 
-with Ada.Text_IO;
+with Simple_IO;
 with Std_Names;
 with Vhdl.Errors; use Vhdl.Errors;
 with Vhdl.Nodes_Utils;
@@ -2221,7 +2221,7 @@ package body Trans.Chap8 is
             end;
 
          when others =>
-            Ada.Text_IO.Put_Line
+            Simple_IO.Put_Line_Err
               ("translate_implicit_procedure_call: cannot handle "
                & Iir_Predefined_Functions'Image (Kind));
             raise Internal_Error;
diff --git a/src/vhdl/translate/trans_analyzes.adb b/src/vhdl/translate/trans_analyzes.adb
index 8362938d8..2311b12eb 100644
--- a/src/vhdl/translate/trans_analyzes.adb
+++ b/src/vhdl/translate/trans_analyzes.adb
@@ -16,11 +16,11 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 
+with Errorout;
+with Simple_IO;
 with Vhdl.Utils; use Vhdl.Utils;
 with Vhdl.Nodes_Walk; use Vhdl.Nodes_Walk;
 with Vhdl.Disp_Vhdl;
-with Ada.Text_IO;
-with Errorout;
 with Vhdl.Errors; use Vhdl.Errors;
 
 package body Trans_Analyzes is
@@ -230,7 +230,7 @@ package body Trans_Analyzes is
 
    procedure Dump_Drivers (Proc : Iir; List : Iir_List)
    is
-      use Ada.Text_IO;
+      use Simple_IO;
       use Errorout;
       El : Iir;
       It : List_Iterator;
diff --git a/src/vhdl/translate/trans_be.adb b/src/vhdl/translate/trans_be.adb
index de7078651..d4002cbcf 100644
--- a/src/vhdl/translate/trans_be.adb
+++ b/src/vhdl/translate/trans_be.adb
@@ -16,8 +16,8 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 
+with Simple_IO;
 with Vhdl.Errors; use Vhdl.Errors;
-with Ada.Text_IO;
 with Vhdl.Back_End;
 
 package body Trans_Be is
@@ -63,7 +63,7 @@ package body Trans_Be is
 
    procedure Disp_Option
    is
-      procedure P (Str : String) renames Ada.Text_IO.Put_Line;
+      procedure P (Str : String) renames Simple_IO.Put_Line;
    begin
       P ("  --dump-drivers     dump processes drivers");
    end Disp_Option;