diff options
| author | synergydev <synergye@codefi.re> | 2013-08-08 04:40:50 -0700 |
|---|---|---|
| committer | synergydev <synergye@codefi.re> | 2013-08-08 15:04:43 -0700 |
| commit | b418cc876926be9532aa8ea868186aa92ed462a0 (patch) | |
| tree | 6157be055e3b838af0c65f9b95824580b5ddc7e7 /gcc-4.8/gcc/cp | |
| parent | 34cef20a1108ff399ecbe13f42e1f6bc8c909b27 (diff) | |
| download | toolchain_gcc-b418cc876926be9532aa8ea868186aa92ed462a0.tar.gz toolchain_gcc-b418cc876926be9532aa8ea868186aa92ed462a0.tar.bz2 toolchain_gcc-b418cc876926be9532aa8ea868186aa92ed462a0.zip | |
[4.8] Backport diagnostic color support from trunk
Squashed commit of r197841, r197842, and r198332 from trunk.
This is capable of coloring errors, warnings, notes, carets, locus', and/or quotes.
Documentation for this feature may be found here:
http://gcc.gnu.org/onlinedocs/gcc/Language-Independent-Options.html
Change-Id: I14f2f852562d18fcef807583635e4e2ceee64829
Diffstat (limited to 'gcc-4.8/gcc/cp')
| -rw-r--r-- | gcc-4.8/gcc/cp/error.c | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/gcc-4.8/gcc/cp/error.c b/gcc-4.8/gcc/cp/error.c index 35ea0dfe7..a35258748 100644 --- a/gcc-4.8/gcc/cp/error.c +++ b/gcc-4.8/gcc/cp/error.c @@ -3010,14 +3010,14 @@ cp_print_error_function (diagnostic_context *context, { if (context->show_column && s.column != 0) pp_printf (context->printer, - _(" inlined from %qs at %s:%d:%d"), + _(" inlined from %qs at %r%s:%d:%d%R"), cxx_printable_name_translate (fndecl, 2), - s.file, s.line, s.column); + "locus", s.file, s.line, s.column); else pp_printf (context->printer, - _(" inlined from %qs at %s:%d"), + _(" inlined from %qs at %r%s:%d%R"), cxx_printable_name_translate (fndecl, 2), - s.file, s.line); + "locus", s.file, s.line); } else @@ -3099,11 +3099,11 @@ print_instantiation_partial_context_line (diagnostic_context *context, xloc = expand_location (loc); if (context->show_column) - pp_verbatim (context->printer, _("%s:%d:%d: "), - xloc.file, xloc.line, xloc.column); + pp_verbatim (context->printer, _("%r%s:%d:%d:%R "), + "locus", xloc.file, xloc.line, xloc.column); else - pp_verbatim (context->printer, _("%s:%d: "), - xloc.file, xloc.line); + pp_verbatim (context->printer, _("%r%s:%d:%R "), + "locus", xloc.file, xloc.line); if (t != NULL) { @@ -3177,14 +3177,16 @@ print_instantiation_partial_context (diagnostic_context *context, xloc = expand_location (loc); if (context->show_column) pp_verbatim (context->printer, - _("%s:%d:%d: [ skipping %d instantiation contexts, " - "use -ftemplate-backtrace-limit=0 to disable ]\n"), - xloc.file, xloc.line, xloc.column, skip); + _("%r%s:%d:%d:%R [ skipping %d instantiation " + "contexts, use -ftemplate-backtrace-limit=0 to " + "disable ]\n"), + "locus", xloc.file, xloc.line, xloc.column, skip); else pp_verbatim (context->printer, - _("%s:%d: [ skipping %d instantiation contexts, " - "use -ftemplate-backtrace-limit=0 to disable ]\n"), - xloc.file, xloc.line, skip); + _("%r%s:%d:%R [ skipping %d instantiation " + "contexts, use -ftemplate-backtrace-limit=0 to " + "disable ]\n"), + "locus", xloc.file, xloc.line, skip); do { loc = t->locus; @@ -3246,12 +3248,12 @@ maybe_print_constexpr_context (diagnostic_context *context) const char *s = expr_as_string (t, 0); if (context->show_column) pp_verbatim (context->printer, - _("%s:%d:%d: in constexpr expansion of %qs"), - xloc.file, xloc.line, xloc.column, s); + _("%r%s:%d:%d:%R in constexpr expansion of %qs"), + "locus", xloc.file, xloc.line, xloc.column, s); else pp_verbatim (context->printer, - _("%s:%d: in constexpr expansion of %qs"), - xloc.file, xloc.line, s); + _("%r%s:%d:%R in constexpr expansion of %qs"), + "locus", xloc.file, xloc.line, s); pp_base_newline (context->printer); } } |