OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Joseph Myers 2005-11-03 23:08:18 +00:00 committed by Joseph Myers
parent b0ae01d7f9
commit 178b58b59e
13 changed files with 132 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2005-11-03 Joseph S. Myers <joseph@codesourcery.com>
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.
2005-11-03 Eric Botcazou <ebotcazou@adacore.com>
* dwarf2asm.c (dw2_force_const_mem): Add new parameter 'public'.

8
gcc/cp/ChangeLog
View File

@ -1,3 +1,11 @@
2005-11-03 Joseph S. Myers <joseph@codesourcery.com>
PR c++/17964
* 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.
2005-11-03 Mark Mitchell <mark@codesourcery.com>
PR c++/21627

3
gcc/cp/cp-tree.h
View File

@ -4437,5 +4437,8 @@ extern void cp_genericize (tree);
#else
#define ATTRIBUTE_GCC_CXXDIAG(m, n) ATTRIBUTE_NONNULL(m)
#endif
extern void cp_cpp_error (cpp_reader *, int,
const char *, va_list)
ATTRIBUTE_GCC_CXXDIAG(3,0);
#endif /* ! GCC_CP_TREE_H */

33
gcc/cp/error.c
View File

@ -2327,3 +2327,36 @@ cp_printer (pretty_printer *pp, text_info *text, const char *spec,
#undef next_lang
#undef next_int
}
/* Callback from cpp_error for PFILE to print diagnostics arising from
interpreting strings. The diagnostic is of type LEVEL; MSG is the
translated message and AP the arguments. */
void
cp_cpp_error (cpp_reader *pfile ATTRIBUTE_UNUSED, int level,
const char *msg, va_list ap)
{
diagnostic_info diagnostic;
diagnostic_t dlevel;
switch (level)
{
case CPP_DL_WARNING:
case CPP_DL_WARNING_SYSHDR:
dlevel = DK_WARNING;
break;
case CPP_DL_PEDWARN:
dlevel = pedantic_error_kind ();
break;
case CPP_DL_ERROR:
dlevel = DK_ERROR;
break;
case CPP_DL_ICE:
dlevel = DK_ICE;
break;
default:
gcc_unreachable ();
}
diagnostic_set_info_translated (&diagnostic, msg, &ap,
input_location, dlevel);
report_diagnostic (&diagnostic);
}

5
gcc/cp/parser.c
View File

@ -297,6 +297,11 @@ cp_lexer_new_main (void)
string constant concatenation. */
c_lex_return_raw_strings = false;
/* Subsequent preprocessor diagnostics should use compiler
diagnostic functions to get the compiler source location. */
cpp_get_options (parse_in)->client_diagnostic = true;
cpp_get_callbacks (parse_in)->error = cp_cpp_error;
gcc_assert (lexer->next_token->type != CPP_PURGED);
return lexer;
}

24
gcc/diagnostic.c
View File

@ -112,17 +112,29 @@ diagnostic_initialize (diagnostic_context *context)
context->lock = 0;
}
/* Initialize DIAGNOSTIC, where the message MSG has already been
translated. */
void
diagnostic_set_info_translated (diagnostic_info *diagnostic, const char *msg,
va_list *args, location_t location,
diagnostic_t kind)
{
diagnostic->message.err_no = errno;
diagnostic->message.args_ptr = args;
diagnostic->message.format_spec = msg;
diagnostic->location = location;
diagnostic->kind = kind;
diagnostic->option_index = 0;
}
/* Initialize DIAGNOSTIC, where the message GMSGID has not yet been
translated. */
void
diagnostic_set_info (diagnostic_info *diagnostic, const char *gmsgid,
va_list *args, location_t location,
diagnostic_t kind)
{
diagnostic->message.err_no = errno;
diagnostic->message.args_ptr = args;
diagnostic->message.format_spec = _(gmsgid);
diagnostic->location = location;
diagnostic->kind = kind;
diagnostic->option_index = 0;
diagnostic_set_info_translated (diagnostic, _(gmsgid), args, location, kind);
}
/* Return a malloc'd string describing a location. The caller is

4
gcc/diagnostic.h
View File

@ -184,6 +184,10 @@ extern void diagnostic_report_diagnostic (diagnostic_context *,
#ifdef ATTRIBUTE_GCC_DIAG
extern void diagnostic_set_info (diagnostic_info *, const char *, va_list *,
location_t, diagnostic_t) ATTRIBUTE_GCC_DIAG(2,0);
extern void diagnostic_set_info_translated (diagnostic_info *, const char *,
va_list *, location_t,
diagnostic_t)
ATTRIBUTE_GCC_DIAG(2,0);
#endif
extern char *diagnostic_build_prefix (diagnostic_info *);

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2005-11-03 Joseph S. Myers <joseph@codesourcery.com>
PR c++/17964
* g++.dg/cpp/string-1.C: New test.
2005-11-03 Joseph S. Myers <joseph@codesourcery.com>
* gcc.target/powerpc: New directory.

9
gcc/testsuite/g++.dg/cpp/string-1.C Normal file
View File

@ -0,0 +1,9 @@
// Test location of diagnostics for interpreting strings. Bug 17964.
// Origin: Joseph Myers <joseph@codesourcery.com>
// { dg-do compile }
const char *s = "\q"; // { dg-error "unknown escape sequence" }
const char *t = "\ "; // { dg-error "unknown escape sequence" }
const char *u = "";

8
libcpp/ChangeLog
View File

@ -1,3 +1,11 @@
2005-11-03 Joseph S. Myers <joseph@codesourcery.com>
PR c++/17964
* 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.
2005-10-21 James E Wilson <wilson@specifix.com>
PR preprocessor/15220

10
libcpp/charset.c
View File

@ -1277,8 +1277,14 @@ convert_escape (cpp_reader *pfile, const uchar *from, const uchar *limit,
cpp_error (pfile, CPP_DL_PEDWARN,
"unknown escape sequence '\\%c'", (int) c);
else
cpp_error (pfile, CPP_DL_PEDWARN,
"unknown escape sequence: '\\%03o'", (int) c);
{
/* diagnostic.c does not support "%03o". When it does, this
code can use %03o directly in the diagnostic again. */
char buf[32];
sprintf(buf, "%03o", (int) c);
cpp_error (pfile, CPP_DL_PEDWARN,
"unknown escape sequence: '\\%s'", buf);
}
}
/* Now convert what we have to the execution character set. */

27
libcpp/errors.c
View File

@ -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);
}

8
libcpp/include/cpplib.h
View File

@ -435,6 +435,9 @@ struct cpp_options
/* True means return pragmas as tokens rather than processing
them directly. */
bool defer_pragmas;
/* True means error callback should be used for diagnostics. */
bool client_diagnostic;
};
/* Callback for header lookup for HEADER, which is the name of a
@ -467,6 +470,11 @@ struct cpp_callbacks
int (*valid_pch) (cpp_reader *, const char *, int);
void (*read_pch) (cpp_reader *, const char *, int, const char *);
missing_header_cb missing_header;
/* Called to emit a diagnostic if client_diagnostic option is true.
This callback receives the translated message. */
void (*error) (cpp_reader *, int, const char *, va_list)
ATTRIBUTE_PRINTF(3,0);
};
/* Chain of directories to look for include files in. */