diff options
Diffstat (limited to 'translate')
| -rw-r--r-- | translate/Makefile | 2 | ||||
| -rw-r--r-- | translate/gcc/dist-common.sh | 2 | ||||
| -rw-r--r-- | translate/ghdldrv/ghdldrv.adb | 3 | ||||
| -rw-r--r-- | translate/ghdldrv/ghdllocal.adb | 9 | ||||
| -rw-r--r-- | translate/ghdldrv/ghdlmain.adb | 4 | ||||
| -rw-r--r-- | translate/ghdldrv/ghdlprint.adb | 1 | ||||
| -rw-r--r-- | translate/ortho_front.adb | 7 | ||||
| -rw-r--r-- | translate/translation.adb | 2 |
8 files changed, 19 insertions, 11 deletions
diff --git a/translate/Makefile b/translate/Makefile index 1fb63e5be..f33e6d52d 100644 --- a/translate/Makefile +++ b/translate/Makefile @@ -18,7 +18,7 @@ BE=gcc ortho_srcdir=../ortho -GNAT_FLAGS=-aI.. -gnaty3befhkmr -gnata -gnatf -gnatwa -gnatwe +GNAT_FLAGS=-aI.. -gnaty3befhkmr -gnata -gnatf -gnatwael #GNAT_FLAGS+=-O -gnatn LN=ln -s diff --git a/translate/gcc/dist-common.sh b/translate/gcc/dist-common.sh index 58c8ba5af..e3ccc9139 100644 --- a/translate/gcc/dist-common.sh +++ b/translate/gcc/dist-common.sh @@ -35,6 +35,8 @@ configuration.adb configuration.ads nodes.ads nodes.adb +options.ads +options.adb lists.ads lists.adb iirs.adb diff --git a/translate/ghdldrv/ghdldrv.adb b/translate/ghdldrv/ghdldrv.adb index 9de01b4ee..b21d63398 100644 --- a/translate/ghdldrv/ghdldrv.adb +++ b/translate/ghdldrv/ghdldrv.adb @@ -36,6 +36,7 @@ with System; with Ghdlmain; use Ghdlmain; with Ghdllocal; use Ghdllocal; with Version; +with Options; package body Ghdldrv is -- Name of the tools used. @@ -655,7 +656,7 @@ package body Ghdldrv is Add_Argument (Compiler_Args, new String'(Opt)); Flag_Expect_Failure := True; Res := Option_Ok; - elsif Flags.Parse_Option (Opt) then + elsif Options.Parse_Option (Opt) then Add_Argument (Compiler_Args, new String'(Opt)); Res := Option_Ok; elsif Opt'Length >= 2 diff --git a/translate/ghdldrv/ghdllocal.adb b/translate/ghdldrv/ghdllocal.adb index 6565f9dce..310dabbfb 100644 --- a/translate/ghdldrv/ghdllocal.adb +++ b/translate/ghdldrv/ghdllocal.adb @@ -33,6 +33,7 @@ with Configuration; with Files_Map; with Post_Sems; with Disp_Tree; +with Options; package body Ghdllocal is -- Version of the IEEE library to use. This just change pathes. @@ -137,7 +138,7 @@ package body Ghdllocal is -- Silently accept -g and -O. Res := Option_Ok; else - if Flags.Parse_Option (Opt) then + if Options.Parse_Option (Opt) then Res := Option_Ok; end if; end if; @@ -161,9 +162,11 @@ package body Ghdllocal is P (" none: do not use a predefined ieee library"); end Disp_Long_Help; - function Get_Version_Path return String is + function Get_Version_Path return String + is + use Flags; begin - case Flags.Vhdl_Std is + case Vhdl_Std is when Vhdl_87 => return "v87"; when Vhdl_93c diff --git a/translate/ghdldrv/ghdlmain.adb b/translate/ghdldrv/ghdlmain.adb index b77ceca01..7cbada3f8 100644 --- a/translate/ghdldrv/ghdlmain.adb +++ b/translate/ghdldrv/ghdlmain.adb @@ -18,8 +18,8 @@ with Ada.Text_IO; with Ada.Command_Line; with Version; -with Flags; with Bug; +with Options; package body Ghdlmain is procedure Init (Cmd : in out Command_Type) @@ -183,7 +183,7 @@ package body Ghdlmain is Error ("warning: command '--option-help' does not accept any argument"); end if; - Flags.Disp_Options_Help; + Options.Disp_Options_Help; end Perform_Action; -- Command Version diff --git a/translate/ghdldrv/ghdlprint.adb b/translate/ghdldrv/ghdlprint.adb index 3dc555044..7a9585402 100644 --- a/translate/ghdldrv/ghdlprint.adb +++ b/translate/ghdldrv/ghdlprint.adb @@ -75,6 +75,7 @@ package body Ghdlprint is procedure PP_Html_File (File : Source_File_Entry) is + use Flags; use Scan; use Tokens; use Files_Map; diff --git a/translate/ortho_front.adb b/translate/ortho_front.adb index aecc232bf..d69c9b1c4 100644 --- a/translate/ortho_front.adb +++ b/translate/ortho_front.adb @@ -31,6 +31,7 @@ with Canon; with Disp_Vhdl; with Bug; with Trans_Be; +with Options; package body Ortho_Front is -- The action to be performed by the compiler. @@ -197,18 +198,18 @@ package body Ortho_Front is end if; return 2; elsif Opt.all = "--help" then - Flags.Disp_Options_Help; + Options.Disp_Options_Help; return 1; elsif Opt.all = "--expect-failure" then Flag_Expect_Failure := True; return 1; elsif Opt'Length > 7 and then Opt (1 .. 7) = "--ghdl-" then - if Flags.Parse_Option (Opt (7 .. Opt'Last)) then + if Options.Parse_Option (Opt (7 .. Opt'Last)) then return 1; else return 0; end if; - elsif Flags.Parse_Option (Opt.all) then + elsif Options.Parse_Option (Opt.all) then return 1; else return 0; diff --git a/translate/translation.adb b/translate/translation.adb index d1d570f06..24fdc7696 100644 --- a/translate/translation.adb +++ b/translate/translation.adb @@ -21,7 +21,7 @@ with Interfaces; use Interfaces; with Ortho_Nodes; use Ortho_Nodes; with Ortho_Ident; use Ortho_Ident; with Evaluation; use Evaluation; -with Flags; +with Flags; use Flags; with Ada.Text_IO; with Types; use Types; with Errorout; use Errorout; |