diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-12-04 16:23:30 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-12-04 16:23:30 +0000 |
| commit | 844289bc923950d0adad54017abd168e22b45a6b (patch) | |
| tree | bae66b4d8111796d303d5cd5f2ab0736acbb1576 | |
| parent | dbd5eb9a657c472273eeb9eee3d9fcc59584543c (diff) | |
| download | ATCD-844289bc923950d0adad54017abd168e22b45a6b.tar.gz | |
ChangeLogTag: Mon Dec 4 16:17:07 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 39 | ||||
| -rw-r--r-- | TAO/TAO_IDL/util/utl_err.cpp | 7 |
2 files changed, 31 insertions, 15 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index b01a56b8e17..23b515b2a51 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Mon Dec 4 16:17:07 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/util/utl_err.cpp (syntax_error): + + Replaced increment of error count with immediate bailout + on any kind of syntax error. Keeping the state of the IDL + compiler consistent in the face of any syntax error would + require extensive hacking of bison-generated code, and we + still wouldn't get any code generation if there are any + errors going into the backend. This fix closes [BUGID:2688]. + Mon Dec 4 15:42:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * MPC/config/*: @@ -57,23 +68,23 @@ Mon Dec 4 07:59:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> Sun Dec 3 14:25:57 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - * tests/ORB_Local_Config/Bug_1459/Makefile.am: - * tests/ORB_Local_Config/Bunch/Makefile.am: - * tests/ORB_Local_Config/Separation/Makefile.am: - * tests/ORB_Local_Config/Shared/Makefile.am: - * tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am: - * tests/ORB_Local_Config/Simple/Makefile.am: - * tests/ORB_Local_Config/Service_Dependency/Makefile.am: + * tests/ORB_Local_Config/Bug_1459/Makefile.am: + * tests/ORB_Local_Config/Bunch/Makefile.am: + * tests/ORB_Local_Config/Separation/Makefile.am: + * tests/ORB_Local_Config/Shared/Makefile.am: + * tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am: + * tests/ORB_Local_Config/Simple/Makefile.am: + * tests/ORB_Local_Config/Service_Dependency/Makefile.am: Regenerated. - * tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc: - * tests/ORB_Local_Config/Bunch/Bunch.mpc: - * tests/ORB_Local_Config/Separation/Separation.mpc: - * tests/ORB_Local_Config/Shared/Shared.mpc: - * tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc: - * tests/ORB_Local_Config/Simple/Simple.mpc: - * tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc: + * tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc: + * tests/ORB_Local_Config/Bunch/Bunch.mpc: + * tests/ORB_Local_Config/Separation/Separation.mpc: + * tests/ORB_Local_Config/Shared/Shared.mpc: + * tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc: + * tests/ORB_Local_Config/Simple/Simple.mpc: + * tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc: Add automake specific section so that includes is set relative to $(srcdir). diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp index 9ca9db04062..1b7eeb85dd2 100644 --- a/TAO/TAO_IDL/util/utl_err.cpp +++ b/TAO/TAO_IDL/util/utl_err.cpp @@ -72,6 +72,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_string.h" #include "global_extern.h" #include "nr_extern.h" +#include "fe_extern.h" #include "ast_interface.h" #include "ast_enum.h" #include "ast_union.h" @@ -630,7 +631,11 @@ UTL_Error::syntax_error (IDL_GlobalData::ParseState ps) ACE_ERROR ((LM_ERROR, "%s\n", parse_state_to_error_message (ps))); - idl_global->set_err_count (idl_global->err_count () + 1); + + // Better to bail here than to increment the error count and + // try to avoid further bogus error messages and crashes + // that may arise. + throw FE_Bailout (); } void |