aboutsummaryrefslogtreecommitdiff
path: root/gcc/objc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/objc')
-rw-r--r--gcc/objc/ChangeLog7
-rw-r--r--gcc/objc/objc-act.c18
2 files changed, 19 insertions, 6 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index aa81466..0fdebda 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,10 @@
+2019-04-05 Martin Liska <mliska@suse.cz>
+
+ PR translation/89935
+ * objc-act.c (objc_add_property_declaration): Use %< and %>, or %qs in
+ order to wrap keywords or arguments.
+ (objc_add_synthesize_declaration_for_property): Likewise.
+
2019-01-09 Sandra Loosemore <sandra@codesourcery.com>
PR other/16615
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index 777225e..5cf7205 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -1090,7 +1090,8 @@ objc_add_property_declaration (location_t location, tree decl,
if (PROPERTY_NONATOMIC (x) != parsed_property_nonatomic)
{
warning_at (location, 0,
- "'nonatomic' attribute of property %qD conflicts with previous declaration", decl);
+ "%<nonatomic%> attribute of property %qD conflicts with "
+ "previous declaration", decl);
if (original_location != UNKNOWN_LOCATION)
inform (original_location, "originally specified here");
@@ -1100,7 +1101,8 @@ objc_add_property_declaration (location_t location, tree decl,
if (PROPERTY_GETTER_NAME (x) != parsed_property_getter_ident)
{
warning_at (location, 0,
- "'getter' attribute of property %qD conflicts with previous declaration", decl);
+ "%<getter%> attribute of property %qD conflicts with "
+ "previous declaration", decl);
if (original_location != UNKNOWN_LOCATION)
inform (original_location, "originally specified here");
@@ -1113,7 +1115,8 @@ objc_add_property_declaration (location_t location, tree decl,
if (PROPERTY_SETTER_NAME (x) != parsed_property_setter_ident)
{
warning_at (location, 0,
- "'setter' attribute of property %qD conflicts with previous declaration", decl);
+ "%<setter%> attribute of property %qD conflicts with "
+ "previous declaration", decl);
if (original_location != UNKNOWN_LOCATION)
inform (original_location, "originally specified here");
@@ -1135,7 +1138,8 @@ objc_add_property_declaration (location_t location, tree decl,
if (PROPERTY_READONLY (x) == 0 && property_readonly == 1)
{
warning_at (location, 0,
- "'readonly' attribute of property %qD conflicts with previous declaration", decl);
+ "%<readonly%> attribute of property %qD conflicts with "
+ "previous declaration", decl);
if (original_location != UNKNOWN_LOCATION)
inform (original_location, "originally specified here");
@@ -7638,7 +7642,8 @@ objc_add_synthesize_declaration_for_property (location_t location, tree interfac
{
location_t original_location = DECL_SOURCE_LOCATION (ivar);
- error_at (location, "'assign' property %qs is using bit-field instance variable %qs",
+ error_at (location, "%<assign%> property %qs is using bit-field "
+ "instance variable %qs",
IDENTIFIER_POINTER (property_name),
IDENTIFIER_POINTER (ivar_name));
@@ -7651,7 +7656,8 @@ objc_add_synthesize_declaration_for_property (location_t location, tree interfac
{
location_t original_location = DECL_SOURCE_LOCATION (ivar);
- error_at (location, "'atomic' property %qs is using bit-field instance variable %qs",
+ error_at (location, "%<atomic%> property %qs is using bit-field "
+ "instance variable %qs",
IDENTIFIER_POINTER (property_name),
IDENTIFIER_POINTER (ivar_name));