diff options
author | Joseph Myers <joseph@codesourcery.com> | 2005-11-03 23:08:18 +0000 |
---|---|---|
committer | Joseph Myers <jsm28@gcc.gnu.org> | 2005-11-03 23:08:18 +0000 |
commit | 178b58b59e18dcb713ef8ed45f79ffa072c617a5 (patch) | |
tree | 4d26b7322a593e1c409570f2ca4e99dccb8dc759 /libcpp/errors.c | |
parent | b0ae01d7f9e4c7e93097856926facb7ce9505f1d (diff) | |
download | gcc-178b58b59e18dcb713ef8ed45f79ffa072c617a5.zip gcc-178b58b59e18dcb713ef8ed45f79ffa072c617a5.tar.gz gcc-178b58b59e18dcb713ef8ed45f79ffa072c617a5.tar.bz2 |
re PR c++/17964 (cpp error messages contain wrong line in C++)
gcc:
PR c++/17964
* diagnostic.c (diagnostic_set_info_translated): New function.
(diagnostic_set_info): Use it. Add comment.
* diagnostic.h (diagnostic_set_info_translated): Declare.
gcc/cp:
* error.c (cp_cpp_error): New function.
* cp-tree.h (cp_cpp_error): Declare.
* parser.c (cp_lexer_new_main): Set CPP option client_diagnostic
and error callback after lexing.
gcc/testsuite:
* g++.dg/cpp/string-1.C: New test.
libcpp:
* include/cpplib.h (struct cpp_options): Add client_diagnostic.
(struct cpp_callbacks): Add error.
* errors.c (cpp_error): If client_diagnostic, use error callback.
* charset.c (convert_escape): Don't use %03o in diagnostic.
From-SVN: r106454
Diffstat (limited to 'libcpp/errors.c')
-rw-r--r-- | libcpp/errors.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/libcpp/errors.c b/libcpp/errors.c index 477101e..554d9e3 100644 --- a/libcpp/errors.c +++ b/libcpp/errors.c @@ -140,20 +140,25 @@ cpp_error (cpp_reader * pfile, int level, const char *msgid, ...) va_start (ap, msgid); - if (CPP_OPTION (pfile, traditional)) - { - if (pfile->state.in_directive) - src_loc = pfile->directive_line; - else - src_loc = pfile->line_table->highest_line; - } + if (CPP_OPTION (pfile, client_diagnostic)) + pfile->cb.error (pfile, level, _(msgid), ap); else { - src_loc = pfile->cur_token[-1].src_loc; - } + if (CPP_OPTION (pfile, traditional)) + { + if (pfile->state.in_directive) + src_loc = pfile->directive_line; + else + src_loc = pfile->line_table->highest_line; + } + else + { + src_loc = pfile->cur_token[-1].src_loc; + } - if (_cpp_begin_message (pfile, level, src_loc, 0)) - v_message (msgid, ap); + if (_cpp_begin_message (pfile, level, src_loc, 0)) + v_message (msgid, ap); + } va_end (ap); } |