diagnostic.h (file_name_as_prefix): Add context argument.

	* diagnostic.h (file_name_as_prefix): Add context argument.
	* diagnostic.c (file_name_as_prefix): Likewise.  Colorize
	the string as locus.
	* langhooks.c (lhd_print_error_function): Adjust caller.
cp/
	* error.c (cp_print_error_function): Adjust file_name_as_prefix
	caller.

From-SVN: r198331

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1768ae8b7ade0ee68d1044e319cc83df9488d7d9..18a0ac0b47dcba34c71f74de6a7dc7fc3d72bacb 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-26  Jakub Jelinek  <jakub@redhat.com>
+
+       * diagnostic.h (file_name_as_prefix): Add context argument.
+       * diagnostic.c (file_name_as_prefix): Likewise.  Colorize
+       the string as locus.
+       * langhooks.c (lhd_print_error_function): Adjust caller.
+
 2013-04-25  Lawrence Crowl  <crowl@google.com>
 
        * var-tracking.c (shared_hash_def::htab):

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 33fc34a1444314222d1cfa198ea0c78096380824..39fbc46db44db5b81808a996e2cad4069b25a1b3 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-26  Jakub Jelinek  <jakub@redhat.com>
+
+       * error.c (cp_print_error_function): Adjust file_name_as_prefix
+       caller.
+
 2013-04-25  Jason Merrill  <jason@redhat.com>
 
        PR c++/56859

diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 4681e8420020aa3a86c7f7f0b21bcc486cb53ea6..c57a5aaa8db663d97e3e71c757ad0057334482e2 100644 (file)
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -2962,7 +2962,7 @@ cp_print_error_function (diagnostic_context *context,
       const char *file = LOCATION_FILE (diagnostic->location);
       tree abstract_origin = diagnostic_abstract_origin (diagnostic);
       char *new_prefix = (file && abstract_origin == NULL)
-                        ? file_name_as_prefix (file) : NULL;
+                        ? file_name_as_prefix (context, file) : NULL;
 
       pp_base_set_prefix (context->printer, new_prefix);
 

diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c
index e454cf31af2c33b581f2cbdbc3391344ad9067b2..f9a236b9113dcca4d8b29eec4fe05c6d00d154f3 100644 (file)
--- a/gcc/diagnostic.c
+++ b/gcc/diagnostic.c
@@ -72,9 +72,12 @@ build_message_string (const char *msg, ...)
 
 /* Same as diagnostic_build_prefix, but only the source FILE is given.  */
 char *
-file_name_as_prefix (const char *f)
+file_name_as_prefix (diagnostic_context *context, const char *f)
 {
-  return build_message_string ("%s: ", f);
+  const char *locus_cs
+    = colorize_start (pp_show_color (context->printer), "locus");
+  const char *locus_ce = colorize_stop (pp_show_color (context->printer));
+  return build_message_string ("%s%s:%s ", locus_cs, f, locus_ce);
 }
 
 

diff --git a/gcc/diagnostic.h b/gcc/diagnostic.h
index 3b500964c7de68101b2fafbc1845ab69837d6ee4..ae6d2b22aa146dd2426f182517224de30523d124 100644 (file)
--- a/gcc/diagnostic.h
+++ b/gcc/diagnostic.h
@@ -293,6 +293,6 @@ void diagnostic_set_caret_max_width (diagnostic_context *context, int value);
 
 
 /* Pure text formatting support functions.  */
-extern char *file_name_as_prefix (const char *);
+extern char *file_name_as_prefix (diagnostic_context *, const char *);
 
 #endif /* ! GCC_DIAGNOSTIC_H */

diff --git a/gcc/langhooks.c b/gcc/langhooks.c
index 70af8da4b30cb8e95dee94fb7742b4e24c71dc43..901f9b4a3001fe82246c525165d8d2368b8f6e60 100644 (file)
--- a/gcc/langhooks.c
+++ b/gcc/langhooks.c
@@ -372,7 +372,7 @@ lhd_print_error_function (diagnostic_context *context, const char *file,
       const char *old_prefix = context->printer->prefix;
       tree abstract_origin = diagnostic_abstract_origin (diagnostic);
       char *new_prefix = (file && abstract_origin == NULL)
-                        ? file_name_as_prefix (file) : NULL;
+                        ? file_name_as_prefix (context, file) : NULL;
 
       pp_set_prefix (context->printer, new_prefix);