From 904f3daa028eea44c6a591fb1ac746ee81c72be1 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Fri, 5 Apr 2019 10:37:44 +0200 Subject: Remove usage of apostrophes in error and warning messages (PR translation/89935). 2019-04-05 Martin Liska PR translation/89935 * check-internal-format-escaping.py: Properly detect wrong apostrophes. 2019-04-05 Martin Liska PR translation/89935 * collect-utils.c (collect_execute): Use %< and %>, or %qs in order to wrap keywords or arguments. * collect2.c (main): Likewise. (scan_prog_file): Likewise. (scan_libraries): Likewise. * common/config/riscv/riscv-common.c (riscv_subset_list::parsing_subset_version): Likewise. (riscv_subset_list::parse_std_ext): Likewise. * config/aarch64/aarch64.c (aarch64_override_options_internal): Likewise. * config/arm/arm.c (arm_option_override): Likewise. * config/cris/cris.c (cris_print_operand): Likewise. * config/darwin-c.c (darwin_pragma_options): Likewise. (darwin_pragma_unused): Likewise. (darwin_pragma_ms_struct): Likewise. * config/ft32/ft32.c (ft32_print_operand): Likewise. * config/i386/i386.c (print_reg): Likewise. (ix86_print_operand): Likewise. * config/i386/xm-djgpp.h: Likewise. * config/iq2000/iq2000.c (iq2000_print_operand): Likewise. * config/m32c/m32c.c (m32c_option_override): Likewise. * config/msp430/msp430.c (msp430_option_override): Likewise. * config/nds32/nds32.c (nds32_option_override): Likewise. * config/nvptx/mkoffload.c (main): Likewise. * config/rx/rx.c (rx_print_operand): Likewise. (valid_psw_flag): Likewise. * config/vms/vms-c.c (vms_pragma_member_alignment): Likewise. (vms_pragma_nomember_alignment): Likewise. (vms_pragma_extern_model): Likewise. * lto-wrapper.c (compile_offload_image): Likewise. * omp-offload.c (oacc_parse_default_dims): Likewise. * symtab.c (symtab_node::verify_base): Likewise. * tlink.c (recompile_files): Likewise. (start_tweaking): Likewise. * tree-profile.c (parse_profile_filter): Likewise. 2019-04-05 Martin Liska 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. From-SVN: r270163 --- gcc/objc/ChangeLog | 7 +++++++ gcc/objc/objc-act.c | 18 ++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) (limited to 'gcc/objc') diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index aa81466fdcb..0fdebdaf161 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,10 @@ +2019-04-05 Martin Liska + + 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 PR other/16615 diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index 777225e9154..5cf7205c23b 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); + "% 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); + "% 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); + "% 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); + "% 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, "% 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, "% property %qs is using bit-field " + "instance variable %qs", IDENTIFIER_POINTER (property_name), IDENTIFIER_POINTER (ivar_name)); -- cgit v1.2.3