diff options
| author | Tristan Gingold <tgingold@free.fr> | 2018-12-15 07:40:34 +0100 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2018-12-16 07:05:31 +0100 |
| commit | 6f3f9645ef7f05150dd13488025d419deb29c6da (patch) | |
| tree | f4b7e32f54cd9e8541c98f92d846e8e2a5e9fcaa | |
| parent | fe1d817d034d969e012faaa661238ff1587aed25 (diff) | |
| download | ghdl-6f3f9645ef7f05150dd13488025d419deb29c6da.tar.gz ghdl-6f3f9645ef7f05150dd13488025d419deb29c6da.tar.bz2 ghdl-6f3f9645ef7f05150dd13488025d419deb29c6da.zip | |
Finish_Compilation: do not raise Compilation_Error.
| -rw-r--r-- | src/ghdldrv/ghdldrv.adb | 4 | ||||
| -rw-r--r-- | src/ghdldrv/ghdlprint.adb | 3 | ||||
| -rw-r--r-- | src/vhdl/sem_lib.adb | 6 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/ghdldrv/ghdldrv.adb b/src/ghdldrv/ghdldrv.adb index b353159d5..7e73a0785 100644 --- a/src/ghdldrv/ghdldrv.adb +++ b/src/ghdldrv/ghdldrv.adb @@ -1503,6 +1503,10 @@ package body Ghdldrv is -- Create list of files. Files_List := Build_Dependence (Prim_Name, Sec_Name); + if Errorout.Nbr_Errors /= 0 then + raise Errorout.Compilation_Error; + end if; + if Cmd.Flag_Depend_Unit then Put_Line ("Units analysis order:"); for I in Design_Units.First .. Design_Units.Last loop diff --git a/src/ghdldrv/ghdlprint.adb b/src/ghdldrv/ghdlprint.adb index 6e75df65f..c0dc66707 100644 --- a/src/ghdldrv/ghdlprint.adb +++ b/src/ghdldrv/ghdlprint.adb @@ -1285,6 +1285,9 @@ package body Ghdlprint is raise Internal_Error; when Date_Parse => Sem_Lib.Load_Design_Unit (Unit, Unit); + if Errorout.Nbr_Errors /= 0 then + raise Compilation_Error; + end if; when Date_Analyze => null; end case; diff --git a/src/vhdl/sem_lib.adb b/src/vhdl/sem_lib.adb index 6139d245e..19ca27230 100644 --- a/src/vhdl/sem_lib.adb +++ b/src/vhdl/sem_lib.adb @@ -99,7 +99,7 @@ package body Sem_Lib is end if; if Errorout.Nbr_Errors > 0 then - raise Compilation_Error; + return; end if; if (Main or Flags.List_All) and then Flags.List_Sem then @@ -116,7 +116,7 @@ package body Sem_Lib is Post_Sems.Post_Sem_Checks (Unit); if Errorout.Nbr_Errors > 0 then - raise Compilation_Error; + return; end if; -- Canonalisation. @@ -134,7 +134,7 @@ package body Sem_Lib is end if; if Errorout.Nbr_Errors > 0 then - raise Compilation_Error; + return; end if; if (Main or Flags.List_All) and then Flags.List_Canon then |