errorout: make it more neutral.

1 files changed, 9 insertions, 8 deletions

diff --git a/src/errorout.ads b/src/errorout.ads
index 88b82b18a..860e663ba 100644
--- a/src/errorout.ads
+++ b/src/errorout.ads
@@ -16,7 +16,7 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 with Types; use Types;
-with Vhdl.Nodes; use Vhdl.Nodes;
+with Vhdl.Nodes;
 with Vhdl.Tokens;
 
 package Errorout is
@@ -226,7 +226,7 @@ package Errorout is
    --  Disp an error, prepended with program name, and raise option_error.
    --  This is used for errors before initialisation, such as bad option or
    --  bad filename.
-   procedure Error_Msg_Option (Msg: String);
+   procedure Error_Msg_Option (Msg: String; Args : Earg_Arr := No_Eargs);
    pragma No_Return (Error_Msg_Option);
 
    --  Same as Error_Msg_Option but do not raise Option_Error.
@@ -235,29 +235,30 @@ package Errorout is
    --  Warn about an option.
    procedure Warning_Msg_Option (Id : Msgid_Warnings; Msg: String);
 
-   function Make_Earg_Vhdl_Node (V : Iir) return Earg_Type;
+   function Make_Earg_Vhdl_Node (V : Vhdl.Nodes.Iir) return Earg_Type;
    function Make_Earg_Vhdl_Token (V : Vhdl.Tokens.Token_Type) return Earg_Type;
 private
    type Earg_Kind is
      (Earg_None,
-      Earg_Iir, Earg_Location, Earg_Id, Earg_Char, Earg_Token, Earg_String8);
+      Earg_Location, Earg_Id, Earg_Char, Earg_String8,
+      Earg_Vhdl_Node, Earg_Vhdl_Token);
 
    type Earg_Type (Kind : Earg_Kind := Earg_None) is record
       case Kind is
          when Earg_None =>
             null;
-         when Earg_Iir =>
-            Val_Iir : Iir;
          when Earg_Location =>
             Val_Loc : Location_Type;
          when Earg_Id =>
             Val_Id : Name_Id;
          when Earg_Char =>
             Val_Char : Character;
-         when Earg_Token =>
-            Val_Tok : Vhdl.Tokens.Token_Type;
          when Earg_String8 =>
             Val_Str8 : String8_Len_Type;
+         when Earg_Vhdl_Node =>
+            Val_Vhdl_Node : Vhdl.Nodes.Iir;
+         when Earg_Vhdl_Token =>
+            Val_Vhdl_Tok : Vhdl.Tokens.Token_Type;
       end case;
    end record;