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

re PR c++/24985 (caret diagnostics) 

2012-05-04  Manuel López-Ibáñez  <manu@gcc.gnu.org>

	PR c++/24985
gcc/
	* tree-diagnostic.c (maybe_unwind_expanded_macro_loc): Show caret
	for macro expansion.

From-SVN: r187134
This commit is contained in:
Manuel López-Ibáñez 2012-05-04 00:31:55 +00:00
parent 07c49ed5a6
commit 2445414102
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2012-05-04 Manuel López-Ibáñez <manu@gcc.gnu.org>
PR c++/24985
* tree-diagnostic.c (maybe_unwind_expanded_macro_loc): Show caret
for macro expansion.
2012-05-03 Manuel López-Ibáñez <manu@gcc.gnu.org>
* flags.h (flag_permissive): Do not declare.

18
gcc/tree-diagnostic.c
View File

@ -187,30 +187,30 @@ maybe_unwind_expanded_macro_loc (diagnostic_context *context,
LRK_MACRO_DEFINITION_LOCATION, NULL);
saved_kind = diagnostic->kind;
saved_prefix = context->printer->prefix;
saved_prefix = pp_get_prefix (context->printer);
saved_location = diagnostic->location;
diagnostic->kind = DK_NOTE;
diagnostic->location = resolved_def_loc;
pp_base_set_prefix (context->printer,
diagnostic_build_prefix (context,
diagnostic));
pp_set_prefix (context->printer,
diagnostic_build_prefix (context, diagnostic));
pp_newline (context->printer);
pp_printf (context->printer, "in expansion of macro '%s'",
linemap_map_get_macro_name (iter->map));
pp_destroy_prefix (context->printer);
diagnostic_show_locus (context, diagnostic);
diagnostic->location = resolved_exp_loc;
pp_base_set_prefix (context->printer,
diagnostic_build_prefix (context,
diagnostic));
pp_set_prefix (context->printer,
diagnostic_build_prefix (context, diagnostic));
pp_newline (context->printer);
pp_printf (context->printer, "expanded from here");
pp_string (context->printer, "expanded from here");
pp_destroy_prefix (context->printer);
diagnostic_show_locus (context, diagnostic);
diagnostic->kind = saved_kind;
diagnostic->location = saved_location;
context->printer->prefix = saved_prefix;
pp_set_prefix (context->printer, saved_prefix);
}
VEC_free (loc_map_pair, heap, loc_vec);