diff options
| -rw-r--r-- | src/ghdldrv/ghdlcomp.adb | 28 | ||||
| -rw-r--r-- | src/ghdldrv/ghdldrv.adb | 52 | ||||
| -rw-r--r-- | src/ghdldrv/ghdllocal.adb | 40 | ||||
| -rw-r--r-- | src/ghdldrv/ghdlmain.adb | 12 | ||||
| -rw-r--r-- | src/ghdldrv/ghdlmain.ads | 2 | ||||
| -rw-r--r-- | src/ghdldrv/ghdlprint.adb | 61 | ||||
| -rw-r--r-- | src/ghdldrv/ghdlrun.adb | 4 | ||||
| -rw-r--r-- | src/ghdldrv/ghdlsynth.adb | 4 | ||||
| -rw-r--r-- | src/ghdldrv/ghdlvpi.adb | 12 | ||||
| -rw-r--r-- | src/ghdldrv/ghdlxml.adb | 4 |
10 files changed, 111 insertions, 108 deletions
diff --git a/src/ghdldrv/ghdlcomp.adb b/src/ghdldrv/ghdlcomp.adb index 6533d9225..feab679cd 100644 --- a/src/ghdldrv/ghdlcomp.adb +++ b/src/ghdldrv/ghdlcomp.adb @@ -105,7 +105,7 @@ package body Ghdlcomp is return Boolean; function Get_Short_Help (Cmd : Command_Run) return String; - procedure Perform_Action (Cmd : in out Command_Run; + procedure Perform_Action (Cmd : Command_Run; Args : Argument_List); function Decode_Command (Cmd : Command_Run; Name : String) @@ -124,7 +124,7 @@ package body Ghdlcomp is end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Run; + procedure Perform_Action (Cmd : Command_Run; Args : Argument_List) is pragma Unreferenced (Cmd); @@ -160,7 +160,7 @@ package body Ghdlcomp is Option : String; Arg : String; Res : out Option_Res); - procedure Perform_Action (Cmd : in out Command_Compile; + procedure Perform_Action (Cmd : Command_Compile; Args : Argument_List); function Decode_Command (Cmd : Command_Compile; Name : String) @@ -293,7 +293,7 @@ package body Ghdlcomp is Hooks.Run.all; end Compile_Run; - procedure Perform_Action (Cmd : in out Command_Compile; + procedure Perform_Action (Cmd : Command_Compile; Args : Argument_List) is pragma Unreferenced (Cmd); @@ -358,7 +358,7 @@ package body Ghdlcomp is return Boolean; function Get_Short_Help (Cmd : Command_Analyze) return String; - procedure Perform_Action (Cmd : in out Command_Analyze; + procedure Perform_Action (Cmd : Command_Analyze; Args : Argument_List); function Decode_Command (Cmd : Command_Analyze; Name : String) @@ -376,7 +376,7 @@ package body Ghdlcomp is return "-a [OPTS] FILEs Analyze FILEs"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Analyze; + procedure Perform_Action (Cmd : Command_Analyze; Args : Argument_List) is pragma Unreferenced (Cmd); @@ -469,7 +469,7 @@ package body Ghdlcomp is Arg : String; Res : out Option_Res); - procedure Perform_Action (Cmd : in out Command_Elab; + procedure Perform_Action (Cmd : Command_Elab; Args : Argument_List); function Decode_Command (Cmd : Command_Elab; Name : String) @@ -513,7 +513,7 @@ package body Ghdlcomp is end if; end Decode_Option; - procedure Perform_Action (Cmd : in out Command_Elab; + procedure Perform_Action (Cmd : Command_Elab; Args : Argument_List) is pragma Unreferenced (Cmd); @@ -546,7 +546,7 @@ package body Ghdlcomp is function Decode_Command (Cmd : Command_Dispconfig; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Dispconfig) return String; - procedure Perform_Action (Cmd : in out Command_Dispconfig; + procedure Perform_Action (Cmd : Command_Dispconfig; Args : Argument_List); function Decode_Command (Cmd : Command_Dispconfig; Name : String) @@ -578,7 +578,7 @@ package body Ghdlcomp is end loop; end Disp_Config; - procedure Perform_Action (Cmd : in out Command_Dispconfig; + procedure Perform_Action (Cmd : Command_Dispconfig; Args : Argument_List) is pragma Unreferenced (Cmd); @@ -598,7 +598,7 @@ package body Ghdlcomp is function Decode_Command (Cmd : Command_Make; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Make) return String; - procedure Perform_Action (Cmd : in out Command_Make; + procedure Perform_Action (Cmd : Command_Make; Args : Argument_List); function Decode_Command (Cmd : Command_Make; Name : String) @@ -616,7 +616,7 @@ package body Ghdlcomp is return "-m [OPTS] UNIT [ARCH] Make UNIT"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Make; Args : Argument_List) + procedure Perform_Action (Cmd : Command_Make; Args : Argument_List) is pragma Unreferenced (Cmd); use Types; @@ -724,7 +724,7 @@ package body Ghdlcomp is function Decode_Command (Cmd : Command_Gen_Makefile; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Gen_Makefile) return String; - procedure Perform_Action (Cmd : in out Command_Gen_Makefile; + procedure Perform_Action (Cmd : Command_Gen_Makefile; Args : Argument_List); function Decode_Command (Cmd : Command_Gen_Makefile; Name : String) @@ -750,7 +750,7 @@ package body Ghdlcomp is return True; end Is_Makeable_File; - procedure Perform_Action (Cmd : in out Command_Gen_Makefile; + procedure Perform_Action (Cmd : Command_Gen_Makefile; Args : Argument_List) is pragma Unreferenced (Cmd); diff --git a/src/ghdldrv/ghdldrv.adb b/src/ghdldrv/ghdldrv.adb index 7e73a0785..a15736222 100644 --- a/src/ghdldrv/ghdldrv.adb +++ b/src/ghdldrv/ghdldrv.adb @@ -731,7 +731,7 @@ package body Ghdldrv is function Decode_Command (Cmd : Command_Dispconfig; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Dispconfig) return String; - procedure Perform_Action (Cmd : in out Command_Dispconfig; + procedure Perform_Action (Cmd : Command_Dispconfig; Args : Argument_List); function Decode_Command (Cmd : Command_Dispconfig; Name : String) @@ -749,7 +749,7 @@ package body Ghdldrv is return "--disp-config Disp tools path"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Dispconfig; + procedure Perform_Action (Cmd : Command_Dispconfig; Args : Argument_List) is use Libraries; @@ -816,7 +816,7 @@ package body Ghdldrv is function Decode_Command (Cmd : Command_Bootstrap; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Bootstrap) return String; - procedure Perform_Action (Cmd : in out Command_Bootstrap; + procedure Perform_Action (Cmd : Command_Bootstrap; Args : Argument_List); function Decode_Command (Cmd : Command_Bootstrap; Name : String) @@ -834,7 +834,7 @@ package body Ghdldrv is return "--bootstrap-standard (Internal) compile std.standard"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Bootstrap; + procedure Perform_Action (Cmd : Command_Bootstrap; Args : Argument_List) is pragma Unreferenced (Cmd); @@ -856,7 +856,7 @@ package body Ghdldrv is function Decode_Command (Cmd : Command_Analyze; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Analyze) return String; - procedure Perform_Action (Cmd : in out Command_Analyze; + procedure Perform_Action (Cmd : Command_Analyze; Args : Argument_List); function Decode_Command (Cmd : Command_Analyze; Name : String) @@ -874,7 +874,7 @@ package body Ghdldrv is return "-a [OPTS] FILEs Analyze FILEs"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Analyze; + procedure Perform_Action (Cmd : Command_Analyze; Args : Argument_List) is pragma Unreferenced (Cmd); @@ -1062,7 +1062,7 @@ package body Ghdldrv is function Decode_Command (Cmd : Command_Elab; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Elab) return String; - procedure Perform_Action (Cmd : in out Command_Elab; + procedure Perform_Action (Cmd : Command_Elab; Args : Argument_List); function Decode_Command (Cmd : Command_Elab; Name : String) @@ -1080,7 +1080,7 @@ package body Ghdldrv is return "-e [OPTS] UNIT [ARCH] Elaborate UNIT"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Elab; Args : Argument_List) + procedure Perform_Action (Cmd : Command_Elab; Args : Argument_List) is pragma Unreferenced (Cmd); Success : Boolean; @@ -1101,7 +1101,7 @@ package body Ghdldrv is function Decode_Command (Cmd : Command_Run; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Run) return String; - procedure Perform_Action (Cmd : in out Command_Run; + procedure Perform_Action (Cmd : Command_Run; Args : Argument_List); function Decode_Command (Cmd : Command_Run; Name : String) @@ -1132,7 +1132,7 @@ package body Ghdldrv is Set_Exit_Status (Exit_Status (Status)); end Run_Design; - procedure Perform_Action (Cmd : in out Command_Run; Args : Argument_List) + procedure Perform_Action (Cmd : Command_Run; Args : Argument_List) is pragma Unreferenced (Cmd); Suffix : constant String_Access := Get_Executable_Suffix; @@ -1159,7 +1159,7 @@ package body Ghdldrv is function Decode_Command (Cmd : Command_Elab_Run; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Elab_Run) return String; - procedure Perform_Action (Cmd : in out Command_Elab_Run; + procedure Perform_Action (Cmd : Command_Elab_Run; Args : Argument_List); function Decode_Command (Cmd : Command_Elab_Run; Name : String) @@ -1177,7 +1177,7 @@ package body Ghdldrv is return "--elab-run [OPTS] UNIT [ARCH] [OPTS] Elaborate and run UNIT"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Elab_Run; + procedure Perform_Action (Cmd : Command_Elab_Run; Args : Argument_List) is pragma Unreferenced (Cmd); @@ -1202,7 +1202,7 @@ package body Ghdldrv is function Decode_Command (Cmd : Command_Bind; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Bind) return String; - procedure Perform_Action (Cmd : in out Command_Bind; + procedure Perform_Action (Cmd : Command_Bind; Args : Argument_List); function Decode_Command (Cmd : Command_Bind; Name : String) @@ -1220,7 +1220,7 @@ package body Ghdldrv is return "--bind [OPTS] UNIT [ARCH] Bind UNIT"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Bind; Args : Argument_List) + procedure Perform_Action (Cmd : Command_Bind; Args : Argument_List) is pragma Unreferenced (Cmd); begin @@ -1235,7 +1235,7 @@ package body Ghdldrv is function Decode_Command (Cmd : Command_Link; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Link) return String; - procedure Perform_Action (Cmd : in out Command_Link; Args : Argument_List); + procedure Perform_Action (Cmd : Command_Link; Args : Argument_List); function Decode_Command (Cmd : Command_Link; Name : String) return Boolean @@ -1252,7 +1252,7 @@ package body Ghdldrv is return "--link [OPTS] UNIT [ARCH] Link UNIT"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Link; Args : Argument_List) + procedure Perform_Action (Cmd : Command_Link; Args : Argument_List) is pragma Unreferenced (Cmd); begin @@ -1269,7 +1269,7 @@ package body Ghdldrv is function Decode_Command (Cmd : Command_List_Link; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_List_Link) return String; - procedure Perform_Action (Cmd : in out Command_List_Link; + procedure Perform_Action (Cmd : Command_List_Link; Args : Argument_List); function Decode_Command (Cmd : Command_List_Link; Name : String) @@ -1287,7 +1287,7 @@ package body Ghdldrv is return "--list-link [OPTS] UNIT [ARCH] List objects file to link UNIT"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_List_Link; + procedure Perform_Action (Cmd : Command_List_Link; Args : Argument_List) is pragma Unreferenced (Cmd); @@ -1310,7 +1310,7 @@ package body Ghdldrv is Arg : String; Res : out Option_Res); - procedure Perform_Action (Cmd : in out Command_Anaelab; + procedure Perform_Action (Cmd : Command_Anaelab; Args : Argument_List); function Decode_Command (Cmd : Command_Anaelab; Name : String) @@ -1343,7 +1343,7 @@ package body Ghdldrv is end if; end Decode_Option; - procedure Perform_Action (Cmd : in out Command_Anaelab; + procedure Perform_Action (Cmd : Command_Anaelab; Args : Argument_List) is pragma Unreferenced (Cmd); @@ -1390,7 +1390,7 @@ package body Ghdldrv is function Get_Short_Help (Cmd : Command_Make) return String; procedure Disp_Long_Help (Cmd : Command_Make); - procedure Perform_Action (Cmd : in out Command_Make; + procedure Perform_Action (Cmd : Command_Make; Args : Argument_List); function Decode_Command (Cmd : Command_Make; Name : String) @@ -1472,7 +1472,7 @@ package body Ghdldrv is return False; end Missing_Object_File; - procedure Perform_Action (Cmd : in out Command_Make; Args : Argument_List) + procedure Perform_Action (Cmd : Command_Make; Args : Argument_List) is use Configuration; @@ -1676,7 +1676,7 @@ package body Ghdldrv is function Decode_Command (Cmd : Command_Gen_Makefile; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Gen_Makefile) return String; - procedure Perform_Action (Cmd : in out Command_Gen_Makefile; + procedure Perform_Action (Cmd : Command_Gen_Makefile; Args : Argument_List); function Decode_Command (Cmd : Command_Gen_Makefile; Name : String) @@ -1702,7 +1702,7 @@ package body Ghdldrv is return True; end Is_Makeable_File; - procedure Perform_Action (Cmd : in out Command_Gen_Makefile; + procedure Perform_Action (Cmd : Command_Gen_Makefile; Args : Argument_List) is pragma Unreferenced (Cmd); @@ -1715,7 +1715,7 @@ package body Ghdldrv is function Decode_Command (Cmd : Command_Gen_Depends; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Gen_Depends) return String; - procedure Perform_Action (Cmd : in out Command_Gen_Depends; + procedure Perform_Action (Cmd : Command_Gen_Depends; Args : Argument_List); function Decode_Command (Cmd : Command_Gen_Depends; Name : String) @@ -1734,7 +1734,7 @@ package body Ghdldrv is & " Generate dependencies of UNIT"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Gen_Depends; + procedure Perform_Action (Cmd : Command_Gen_Depends; Args : Argument_List) is pragma Unreferenced (Cmd); diff --git a/src/ghdldrv/ghdllocal.adb b/src/ghdldrv/ghdllocal.adb index 9df81a7b2..030cf118e 100644 --- a/src/ghdldrv/ghdllocal.adb +++ b/src/ghdldrv/ghdllocal.adb @@ -553,7 +553,7 @@ package body Ghdllocal is type Command_Dir is new Command_Lib with null record; function Decode_Command (Cmd : Command_Dir; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Dir) return String; - procedure Perform_Action (Cmd : in out Command_Dir; Args : Argument_List); + procedure Perform_Action (Cmd : Command_Dir; Args : Argument_List); function Decode_Command (Cmd : Command_Dir; Name : String) return Boolean is @@ -570,7 +570,7 @@ package body Ghdllocal is return "--dir [LIBs] Disp contents of the libraries"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Dir; Args : Argument_List) + procedure Perform_Action (Cmd : Command_Dir; Args : Argument_List) is pragma Unreferenced (Cmd); begin @@ -589,7 +589,7 @@ package body Ghdllocal is type Command_Find is new Command_Lib with null record; function Decode_Command (Cmd : Command_Find; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Find) return String; - procedure Perform_Action (Cmd : in out Command_Find; Args : Argument_List); + procedure Perform_Action (Cmd : Command_Find; Args : Argument_List); function Decode_Command (Cmd : Command_Find; Name : String) return Boolean is @@ -622,7 +622,7 @@ package body Ghdllocal is end Is_Top_Entity; -- Disp contents design files FILES. - procedure Perform_Action (Cmd : in out Command_Find; Args : Argument_List) + procedure Perform_Action (Cmd : Command_Find; Args : Argument_List) is pragma Unreferenced (Cmd); @@ -666,7 +666,7 @@ package body Ghdllocal is function Decode_Command (Cmd : Command_Import; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Import) return String; - procedure Perform_Action (Cmd : in out Command_Import; + procedure Perform_Action (Cmd : Command_Import; Args : Argument_List); function Decode_Command (Cmd : Command_Import; Name : String) @@ -684,7 +684,7 @@ package body Ghdllocal is return "-i [OPTS] FILEs Import units of FILEs"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Import; Args : Argument_List) + procedure Perform_Action (Cmd : Command_Import; Args : Argument_List) is pragma Unreferenced (Cmd); use Errorout; @@ -757,7 +757,7 @@ package body Ghdllocal is function Decode_Command (Cmd : Command_Check_Syntax; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Check_Syntax) return String; - procedure Perform_Action (Cmd : in out Command_Check_Syntax; + procedure Perform_Action (Cmd : Command_Check_Syntax; Args : Argument_List); function Decode_Command (Cmd : Command_Check_Syntax; Name : String) @@ -830,7 +830,7 @@ package body Ghdllocal is end if; end Analyze_Files; - procedure Perform_Action (Cmd : in out Command_Check_Syntax; + procedure Perform_Action (Cmd : Command_Check_Syntax; Args : Argument_List) is pragma Unreferenced (Cmd); @@ -842,7 +842,7 @@ package body Ghdllocal is type Command_Clean is new Command_Lib with null record; function Decode_Command (Cmd : Command_Clean; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Clean) return String; - procedure Perform_Action (Cmd : in out Command_Clean; Args : Argument_List); + procedure Perform_Action (Cmd : Command_Clean; Args : Argument_List); function Decode_Command (Cmd : Command_Clean; Name : String) return Boolean is @@ -868,7 +868,7 @@ package body Ghdllocal is end if; end Delete; - procedure Perform_Action (Cmd : in out Command_Clean; Args : Argument_List) + procedure Perform_Action (Cmd : Command_Clean; Args : Argument_List) is pragma Unreferenced (Cmd); use Name_Table; @@ -946,7 +946,7 @@ package body Ghdllocal is function Decode_Command (Cmd : Command_Remove; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Remove) return String; - procedure Perform_Action (Cmd : in out Command_Remove; + procedure Perform_Action (Cmd : Command_Remove; Args : Argument_List); function Decode_Command (Cmd : Command_Remove; Name : String) return Boolean @@ -963,7 +963,7 @@ package body Ghdllocal is return "--remove Remove generated files and library file"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Remove; Args : Argument_List) + procedure Perform_Action (Cmd : Command_Remove; Args : Argument_List) is use Name_Table; begin @@ -981,7 +981,7 @@ package body Ghdllocal is type Command_Copy is new Command_Lib with null record; function Decode_Command (Cmd : Command_Copy; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Copy) return String; - procedure Perform_Action (Cmd : in out Command_Copy; Args : Argument_List); + procedure Perform_Action (Cmd : Command_Copy; Args : Argument_List); function Decode_Command (Cmd : Command_Copy; Name : String) return Boolean is @@ -997,7 +997,7 @@ package body Ghdllocal is return "--copy Copy work library to current directory"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Copy; Args : Argument_List) + procedure Perform_Action (Cmd : Command_Copy; Args : Argument_List) is pragma Unreferenced (Cmd); use Name_Table; @@ -1057,7 +1057,7 @@ package body Ghdllocal is function Decode_Command (Cmd : Command_Disp_Standard; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Disp_Standard) return String; - procedure Perform_Action (Cmd : in out Command_Disp_Standard; + procedure Perform_Action (Cmd : Command_Disp_Standard; Args : Argument_List); function Decode_Command (Cmd : Command_Disp_Standard; Name : String) @@ -1075,7 +1075,7 @@ package body Ghdllocal is return "--disp-standard Disp std.standard in pseudo-vhdl"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Disp_Standard; + procedure Perform_Action (Cmd : Command_Disp_Standard; Args : Argument_List) is pragma Unreferenced (Cmd); @@ -1094,7 +1094,7 @@ package body Ghdllocal is function Decode_Command (Cmd : Command_Find_Top; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Find_Top) return String; - procedure Perform_Action (Cmd : in out Command_Find_Top; + procedure Perform_Action (Cmd : Command_Find_Top; Args : Argument_List); function Decode_Command (Cmd : Command_Find_Top; Name : String) @@ -1112,7 +1112,7 @@ package body Ghdllocal is return "--find-top Disp possible top entity in work library"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Find_Top; + procedure Perform_Action (Cmd : Command_Find_Top; Args : Argument_List) is use Libraries; @@ -1150,7 +1150,7 @@ package body Ghdllocal is function Decode_Command (Cmd : Command_Bug_Box; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Bug_Box) return String; - procedure Perform_Action (Cmd : in out Command_Bug_Box; + procedure Perform_Action (Cmd : Command_Bug_Box; Args : Argument_List); function Decode_Command (Cmd : Command_Bug_Box; Name : String) @@ -1168,7 +1168,7 @@ package body Ghdllocal is return "!--bug-box Crash and emit a bug-box"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Bug_Box; + procedure Perform_Action (Cmd : Command_Bug_Box; Args : Argument_List) is pragma Unreferenced (Cmd, Args); diff --git a/src/ghdldrv/ghdlmain.adb b/src/ghdldrv/ghdlmain.adb index 52bfab5b9..4e655f37a 100644 --- a/src/ghdldrv/ghdlmain.adb +++ b/src/ghdldrv/ghdlmain.adb @@ -89,7 +89,7 @@ package body Ghdlmain is Res : out Option_Res); function Get_Short_Help (Cmd : Command_Help) return String; - procedure Perform_Action (Cmd : in out Command_Help; Args : Argument_List); + procedure Perform_Action (Cmd : Command_Help; Args : Argument_List); function Decode_Command (Cmd : Command_Help; Name : String) return Boolean is @@ -117,7 +117,7 @@ package body Ghdlmain is return "-h or --help [CMD] Disp this help or [help on CMD]"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Help; Args : Argument_List) + procedure Perform_Action (Cmd : Command_Help; Args : Argument_List) is pragma Unreferenced (Cmd); @@ -165,7 +165,7 @@ package body Ghdlmain is function Decode_Command (Cmd : Command_Option_Help; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Option_Help) return String; - procedure Perform_Action (Cmd : in out Command_Option_Help; + procedure Perform_Action (Cmd : Command_Option_Help; Args : Argument_List); function Decode_Command (Cmd : Command_Option_Help; Name : String) @@ -183,7 +183,7 @@ package body Ghdlmain is return "--options-help Disp help for analyzer options"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Option_Help; + procedure Perform_Action (Cmd : Command_Option_Help; Args : Argument_List) is pragma Unreferenced (Cmd); @@ -200,7 +200,7 @@ package body Ghdlmain is function Decode_Command (Cmd : Command_Version; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Version) return String; - procedure Perform_Action (Cmd : in out Command_Version; + procedure Perform_Action (Cmd : Command_Version; Args : Argument_List); function Decode_Command (Cmd : Command_Version; Name : String) @@ -218,7 +218,7 @@ package body Ghdlmain is return "-v or --version Disp ghdl version"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Version; + procedure Perform_Action (Cmd : Command_Version; Args : Argument_List) is pragma Unreferenced (Cmd); diff --git a/src/ghdldrv/ghdlmain.ads b/src/ghdldrv/ghdlmain.ads index 0625dfde9..f5ac4b05d 100644 --- a/src/ghdldrv/ghdlmain.ads +++ b/src/ghdldrv/ghdlmain.ads @@ -59,7 +59,7 @@ package Ghdlmain is procedure Disp_Long_Help (Cmd : Command_Type); -- Perform the action. - procedure Perform_Action (Cmd : in out Command_Type; Args : Argument_List) + procedure Perform_Action (Cmd : Command_Type; Args : Argument_List) is abstract; -- Register a command. diff --git a/src/ghdldrv/ghdlprint.adb b/src/ghdldrv/ghdlprint.adb index c0dc66707..513e68baa 100644 --- a/src/ghdldrv/ghdlprint.adb +++ b/src/ghdldrv/ghdlprint.adb @@ -536,7 +536,7 @@ package body Ghdlprint is function Decode_Command (Cmd : Command_Chop; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Chop) return String; - procedure Perform_Action (Cmd : in out Command_Chop; + procedure Perform_Action (Cmd : Command_Chop; Args : Argument_List); function Decode_Command (Cmd : Command_Chop; Name : String) @@ -554,7 +554,7 @@ package body Ghdlprint is return "--chop [OPTS] FILEs Chop FILEs"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Chop; Args : Argument_List) + procedure Perform_Action (Cmd : Command_Chop; Args : Argument_List) is pragma Unreferenced (Cmd); use Ada.Characters.Latin_1; @@ -834,7 +834,7 @@ package body Ghdlprint is function Decode_Command (Cmd : Command_Lines; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Lines) return String; - procedure Perform_Action (Cmd : in out Command_Lines; + procedure Perform_Action (Cmd : Command_Lines; Args : Argument_List); function Decode_Command (Cmd : Command_Lines; Name : String) @@ -852,7 +852,7 @@ package body Ghdlprint is return "--lines FILEs Precede line with its number"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Lines; Args : Argument_List) + procedure Perform_Action (Cmd : Command_Lines; Args : Argument_List) is pragma Unreferenced (Cmd); use Scanner; @@ -953,7 +953,7 @@ package body Ghdlprint is function Decode_Command (Cmd : Command_Reprint; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Reprint) return String; - procedure Perform_Action (Cmd : in out Command_Reprint; + procedure Perform_Action (Cmd : Command_Reprint; Args : Argument_List); function Decode_Command (Cmd : Command_Reprint; Name : String) @@ -971,7 +971,7 @@ package body Ghdlprint is return "--reprint [OPTS] FILEs Redisplay FILEs"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Reprint; + procedure Perform_Action (Cmd : Command_Reprint; Args : Argument_List) is pragma Unreferenced (Cmd); @@ -1025,7 +1025,7 @@ package body Ghdlprint is function Decode_Command (Cmd : Command_Compare_Tokens; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Compare_Tokens) return String; - procedure Perform_Action (Cmd : in out Command_Compare_Tokens; + procedure Perform_Action (Cmd : Command_Compare_Tokens; Args : Argument_List); function Decode_Command (Cmd : Command_Compare_Tokens; Name : String) @@ -1043,7 +1043,7 @@ package body Ghdlprint is return "--compare-tokens [OPTS] REF FILEs Compare FILEs with REF"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Compare_Tokens; + procedure Perform_Action (Cmd : Command_Compare_Tokens; Args : Argument_List) is pragma Unreferenced (Cmd); @@ -1153,7 +1153,7 @@ package body Ghdlprint is function Decode_Command (Cmd : Command_PP_Html; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_PP_Html) return String; - procedure Perform_Action (Cmd : in out Command_PP_Html; + procedure Perform_Action (Cmd : Command_PP_Html; Files : Argument_List); function Decode_Command (Cmd : Command_PP_Html; Name : String) @@ -1171,7 +1171,7 @@ package body Ghdlprint is return "--pp-html FILEs Pretty-print FILEs in HTML"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_PP_Html; + procedure Perform_Action (Cmd : Command_PP_Html; Files : Argument_List) is pragma Unreferenced (Cmd); @@ -1224,7 +1224,7 @@ package body Ghdlprint is Res : out Option_Res); procedure Disp_Long_Help (Cmd : Command_Xref_Html); - procedure Perform_Action (Cmd : in out Command_Xref_Html; + procedure Perform_Action (Cmd : Command_Xref_Html; Files_Name : Argument_List); function Decode_Command (Cmd : Command_Xref_Html; Name : String) @@ -1296,7 +1296,7 @@ package body Ghdlprint is end Analyze_Design_File_Units; procedure Perform_Action - (Cmd : in out Command_Xref_Html; Files_Name : Argument_List) + (Cmd : Command_Xref_Html; Files_Name : Argument_List) is use GNAT.Directory_Operations; @@ -1310,6 +1310,8 @@ package body Ghdlprint is end record; type File_Data_Array is array (Files_Name'Range) of File_Data; + Output_Dir : String_Access; + Files : File_Data_Array; Output : File_Type; begin @@ -1319,21 +1321,22 @@ package body Ghdlprint is -- Load work library. Setup_Libraries (True); - if Cmd.Output_Dir = null then - Cmd.Output_Dir := new String'("html"); - elsif Cmd.Output_Dir.all = "-" then - Cmd.Output_Dir := null; + Output_Dir := Cmd.Output_Dir; + if Output_Dir = null then + Output_Dir := new String'("html"); + elsif Output_Dir.all = "-" then + Output_Dir := null; end if; -- Try to create the directory. - if Cmd.Output_Dir /= null - and then not Is_Directory (Cmd.Output_Dir.all) + if Output_Dir /= null + and then not Is_Directory (Output_Dir.all) then begin - Make_Dir (Cmd.Output_Dir.all); + Make_Dir (Output_Dir.all); exception when Directory_Error => - Error ("cannot create directory " & Cmd.Output_Dir.all); + Error ("cannot create directory " & Output_Dir.all); return; end; end if; @@ -1419,9 +1422,9 @@ package body Ghdlprint is end loop; for I in Files'Range loop - if Cmd.Output_Dir /= null then + if Output_Dir /= null then Create (Output, Out_File, - Cmd.Output_Dir.all & Directory_Separator + Output_Dir.all & Directory_Separator & Files (I).Output.all); Set_Output (Output); @@ -1443,15 +1446,15 @@ package body Ghdlprint is PP_Html_File (Files (I).Fe); Put_Html_Foot; - if Cmd.Output_Dir /= null then + if Output_Dir /= null then Close (Output); end if; end loop; -- Create indexes. - if Cmd.Output_Dir /= null then + if Output_Dir /= null then Create (Output, Out_File, - Cmd.Output_Dir.all & Directory_Separator & "index.html"); + Output_Dir.all & Directory_Separator & "index.html"); Set_Output (Output); Put_Html_Header; @@ -1497,11 +1500,11 @@ package body Ghdlprint is end if; if Html_Format = Html_Css - and then Cmd.Output_Dir /= null + and then Output_Dir /= null then declare Css_Filename : constant String := - Cmd.Output_Dir.all & Directory_Separator & "ghdl.css"; + Output_Dir.all & Directory_Separator & "ghdl.css"; begin if not Is_Regular_File (Css_Filename & Nul) then Create (Output, Out_File, Css_Filename); @@ -1529,7 +1532,7 @@ package body Ghdlprint is return Boolean; function Get_Short_Help (Cmd : Command_Xref) return String; - procedure Perform_Action (Cmd : in out Command_Xref; + procedure Perform_Action (Cmd : Command_Xref; Files_Name : Argument_List); function Decode_Command (Cmd : Command_Xref; Name : String) @@ -1548,7 +1551,7 @@ package body Ghdlprint is end Get_Short_Help; procedure Perform_Action - (Cmd : in out Command_Xref; Files_Name : Argument_List) + (Cmd : Command_Xref; Files_Name : Argument_List) is pragma Unreferenced (Cmd); diff --git a/src/ghdldrv/ghdlrun.adb b/src/ghdldrv/ghdlrun.adb index c4d9cc3be..3501bb692 100644 --- a/src/ghdldrv/ghdlrun.adb +++ b/src/ghdldrv/ghdlrun.adb @@ -716,7 +716,7 @@ package body Ghdlrun is function Decode_Command (Cmd : Command_Run_Help; Name : String) return Boolean; function Get_Short_Help (Cmd : Command_Run_Help) return String; - procedure Perform_Action (Cmd : in out Command_Run_Help; + procedure Perform_Action (Cmd : Command_Run_Help; Args : Argument_List); function Decode_Command (Cmd : Command_Run_Help; Name : String) @@ -734,7 +734,7 @@ package body Ghdlrun is return "--run-help Disp help for RUNOPTS options"; end Get_Short_Help; - procedure Perform_Action (Cmd : in out Command_Run_Help; + procedure Perform_Action (Cmd : Command_Run_Help; Args : Argument_List) is pragma Unreferenced (Cmd); diff --git a/src/ghdldrv/ghdlsynth.adb b/src/ghdldrv/ghdlsynth.adb index 000e8f64a..fc0610d7f 100644 --- a/src/ghdldrv/ghdlsynth.adb +++ b/src/ghdldrv/ghdlsynth.adb @@ -37,7 +37,7 @@ package body Ghdlsynth is return Boolean; function Get_Short_Help (Cmd : Command_Synth) return String; - procedure Perform_Action (Cmd : in out Command_Synth; + procedure Perform_Action (Cmd : Command_Synth; Args : Argument_List); function Decode_Command (Cmd : Command_Synth; Name : String) @@ -101,7 +101,7 @@ package body Ghdlsynth is -- Hooks.Run.all; end Ghdl_Synth; - procedure Perform_Action (Cmd : in out Command_Synth; + procedure Perform_Action (Cmd : Command_Synth; Args : Argument_List) is pragma Unreferenced (Cmd); diff --git a/src/ghdldrv/ghdlvpi.adb b/src/ghdldrv/ghdlvpi.adb index f05761da6..4c25896ea 100644 --- a/src/ghdldrv/ghdlvpi.adb +++ b/src/ghdldrv/ghdlvpi.adb @@ -205,7 +205,7 @@ package body Ghdlvpi is Extra_Args : Extra_Args_Func; end record; - procedure Perform_Action (Cmd : in out Command_Spawn_Type; + procedure Perform_Action (Cmd : Command_Spawn_Type; Args : Argument_List); procedure Decode_Option (Cmd : in out Command_Spawn_Type; Option : String; @@ -228,7 +228,7 @@ package body Ghdlvpi is end if; end Decode_Option; - procedure Perform_Action (Cmd : in out Command_Spawn_Type; + procedure Perform_Action (Cmd : Command_Spawn_Type; Args : Argument_List) is begin Spawn_Compile (Args, Cmd.Extra_Args.all, Cmd.Flag_Verbose); @@ -239,10 +239,10 @@ package body Ghdlvpi is type Command_Vpi_Flags is new Command_Str_Type with record Flags : Extra_Args_Func; end record; - procedure Perform_Action (Cmd : in out Command_Vpi_Flags; + procedure Perform_Action (Cmd : Command_Vpi_Flags; Args : Argument_List); - procedure Perform_Action (Cmd : in out Command_Vpi_Flags; + procedure Perform_Action (Cmd : Command_Vpi_Flags; Args : Argument_List) is pragma Unreferenced (Args); @@ -255,10 +255,10 @@ package body Ghdlvpi is type Command_Vpi_Disp is new Command_Str_Type with record Disp : String_Func; end record; - procedure Perform_Action (Cmd : in out Command_Vpi_Disp; + procedure Perform_Action (Cmd : Command_Vpi_Disp; Args : Argument_List); - procedure Perform_Action (Cmd : in out Command_Vpi_Disp; + procedure Perform_Action (Cmd : Command_Vpi_Disp; Args : Argument_List) is pragma Unreferenced (Args); diff --git a/src/ghdldrv/ghdlxml.adb b/src/ghdldrv/ghdlxml.adb index a37e6dbe1..1abe3465c 100644 --- a/src/ghdldrv/ghdlxml.adb +++ b/src/ghdldrv/ghdlxml.adb @@ -514,7 +514,7 @@ package body Ghdlxml is return Boolean; function Get_Short_Help (Cmd : Command_File_To_Xml) return String; - procedure Perform_Action (Cmd : in out Command_File_To_Xml; + procedure Perform_Action (Cmd : Command_File_To_Xml; Files_Name : Argument_List); function Decode_Command (Cmd : Command_File_To_Xml; Name : String) @@ -533,7 +533,7 @@ package body Ghdlxml is end Get_Short_Help; procedure Perform_Action - (Cmd : in out Command_File_To_Xml; Files_Name : Argument_List) + (Cmd : Command_File_To_Xml; Files_Name : Argument_List) is pragma Unreferenced (Cmd); |