[12/12] fix diagnostic quoting/spelling issues in ObjC

Message ID 36f4496d-f0ec-1833-571a-d94b7bf23201@gmail.com
State New
Headers show
Series
  • detect quoting and punctuation problems in diagnostics
Related show

Commit Message

Martin Sebor May 14, 2019, 9:33 p.m.
The attached patch fixes quoting, spelling, and other formatting
issues in diagnostics issued by the Objective C/C++ front-end and
pointed out by the -Wformat-diag warning.

Martin

Comments

Iain Sandoe May 14, 2019, 11:16 p.m. | #1
Hi Martin,

> On 14 May 2019, at 22:33, Martin Sebor <msebor@gmail.com> wrote:

> 

> The attached patch fixes quoting, spelling, and other formatting

> issues in diagnostics issued by the Objective C/C++ front-end and

> pointed out by the -Wformat-diag warning.


> <gcc-wformat-diag-objc.diff>


The ObjC changes are OK.

It’s possible there might be a few more testsuite fails from this that are only
tested for the NeXT runtime; those can be picked up later (or if there’s no
hurry to apply this, I can stick it into a run in the next few days).

thanks
Iain

Patch

gcc/objc/ChangeLog:

	* objc-act.c (objc_begin_catch_clause): Quote keywords and options
	in diagnostics.
	(objc_build_throw_stmt): Same.
	(objc_finish_message_expr): Same.
	(get_super_receiver): Same.
	* objc-next-runtime-abi-01.c (objc_next_runtime_abi_01_init): Spell
	out "less than" in English./
	* objc-next-runtime-abi-02.c (objc_next_runtime_abi_02_init): Spell
	out "greater" in English.

diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index 5cf7205c23b..1eb2262b8ec 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -4208,13 +4208,13 @@  objc_begin_catch_clause (tree decl)
     }
   else if (!objc_type_valid_for_messaging (type, false))
     {
-      error ("@catch parameter is not a known Objective-C class type");
+      error ("%<@catch%> parameter is not a known Objective-C class type");
       type = error_mark_node;
     }
   else if (TYPE_HAS_OBJC_INFO (TREE_TYPE (type))
 	   && TYPE_OBJC_PROTOCOL_LIST (TREE_TYPE (type)))
     {
-      error ("@catch parameter cannot be protocol-qualified");
+      error ("%<@catch%> parameter cannot be protocol-qualified");
       type = error_mark_node;
     }
   else if (POINTER_TYPE_P (type) && objc_is_object_id (TREE_TYPE (type)))
@@ -4336,7 +4336,8 @@  objc_build_throw_stmt (location_t loc, tree throw_expr)
       if (cur_try_context == NULL
           || cur_try_context->current_catch == NULL)
 	{
-	  error_at (loc, "%<@throw%> (rethrow) used outside of a @catch block");
+	  error_at (loc,
+		    "%<@throw%> (rethrow) used outside of a %<@catch%> block");
 	  return error_mark_node;
 	}
 
@@ -5411,7 +5412,8 @@  objc_finish_message_expr (tree receiver, tree sel_name, tree method_params,
 		 prototype.  Emit a warning, then keep going (this
 		 will use any method with a matching name, as if the
 		 receiver was of type 'Class').  */
-	      warning (0, "@interface of class %qE not found", class_tree);
+	      warning (0, "%<@interface%> of class %qE not found",
+		       class_tree);
 	    }
 	}
       /* Handle `self' and `super'.  */
@@ -5545,7 +5547,7 @@  objc_finish_message_expr (tree receiver, tree sel_name, tree method_params,
 		     warning, either include an @interface for the
 		     class, or cast the receiver to 'id'.  Note that
 		     rtype is an IDENTIFIER_NODE at this point.  */
-		  warning (0, "@interface of class %qE not found", rtype);
+		  warning (0, "%<@interface%> of class %qE not found", rtype);
 		}
 	    }
 
@@ -5628,11 +5630,9 @@  objc_finish_message_expr (tree receiver, tree sel_name, tree method_params,
       if (!warn_missing_methods)
 	{
 	  warning_at (input_location,
-		      0, "(Messages without a matching method signature");
-	  warning_at (input_location,
-		      0, "will be assumed to return %<id%> and accept");
-	  warning_at (input_location,
-		      0, "%<...%> as arguments.)");
+		      0, "(messages without a matching method signature "
+		      "will be assumed to return %<id%> and accept "
+		      "%<...%> as arguments)");
 	  warn_missing_methods = true;
 	}
     }
@@ -8848,7 +8848,7 @@  get_super_receiver (void)
     }
   else
     {
-      error ("[super ...] must appear in a method context");
+      error ("%<[super ...]%> must appear in a method context");
       return error_mark_node;
     }
 }
diff --git a/gcc/objc/objc-next-runtime-abi-01.c b/gcc/objc/objc-next-runtime-abi-01.c
index 77d2c374bc0..fa83e64b6a1 100644
--- a/gcc/objc/objc-next-runtime-abi-01.c
+++ b/gcc/objc/objc-next-runtime-abi-01.c
@@ -150,7 +150,8 @@  objc_next_runtime_abi_01_init (objc_runtime_hooks *rthooks)
     {
       warning_at (UNKNOWN_LOCATION, OPT_Wall,
 		"%<-fobjc-sjlj-exceptions%> is the only supported exceptions "
-		"system for %<-fnext-runtime%> with %<-fobjc-abi-version%> < 2");
+		"system for %<-fnext-runtime%> with %<-fobjc-abi-version%> "
+		"argument less than 2");
     }
 
   rthooks->initialize = next_runtime_01_initialize;
diff --git a/gcc/objc/objc-next-runtime-abi-02.c b/gcc/objc/objc-next-runtime-abi-02.c
index a2214195b2c..aa1cbde5010 100644
--- a/gcc/objc/objc-next-runtime-abi-02.c
+++ b/gcc/objc/objc-next-runtime-abi-02.c
@@ -241,8 +241,10 @@  objc_next_runtime_abi_02_init (objc_runtime_hooks *rthooks)
 
   if (flag_objc_exceptions && flag_objc_sjlj_exceptions)
     {
-      inform (UNKNOWN_LOCATION, "%<-fobjc-sjlj-exceptions%> is ignored for "
-				"%<-fnext-runtime%> when %<-fobjc-abi-version%> >= 2");
+      inform (UNKNOWN_LOCATION,
+	      "%<-fobjc-sjlj-exceptions%> is ignored for "
+	      "%<-fnext-runtime%> when %<-fobjc-abi-version%> "
+	      "greater than 1");
       flag_objc_sjlj_exceptions = 0;
     }