From 0d7bac69b78fbb3bc2d088e7777472d261ea0a21 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 8 Mar 2019 11:51:28 +0100 Subject: [PATCH] re PR other/80058 (fix double spaces in string literals everywhere) PR other/80058 * lra-constraints.c (process_alt_operands): Avoid one space before " at the end of line and another after " on another line in a string literal. * attribs.c (handle_dll_attribute): Likewise. * config/avr/avr-devices.c (avr_texinfo): Likewise. cp/ * parser.c (cp_parser_template_declaration_after_parameters): Avoid one space before " at the end of line and another after " on another line in a string literal. fortran/ * arith.c (gfc_complex2complex): Avoid two spaces in the middle of diagnostics. * resolve.c (resolve_allocate_expr): Likewise. From-SVN: r269487 --- gcc/ChangeLog | 7 +++++++ gcc/attribs.c | 2 +- gcc/config/avr/avr-devices.c | 2 +- gcc/cp/ChangeLog | 5 +++++ gcc/cp/parser.c | 2 +- gcc/fortran/ChangeLog | 7 +++++++ gcc/fortran/arith.c | 2 +- gcc/fortran/resolve.c | 2 +- gcc/lra-constraints.c | 2 +- 9 files changed, 25 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 86bb8d5e0e9..54f3cd84ca2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,12 @@ 2019-03-08 Jakub Jelinek + PR other/80058 + * lra-constraints.c (process_alt_operands): Avoid one space before + " at the end of line and another after " on another line in a string + literal. + * attribs.c (handle_dll_attribute): Likewise. + * config/avr/avr-devices.c (avr_texinfo): Likewise. + * gimple-ssa-warn-alloca.c (pass_walloca::execute): Don't wrap warning_at or inform messages in G_() if there is no ?:. diff --git a/gcc/attribs.c b/gcc/attribs.c index 408f920dc60..a55638d9389 100644 --- a/gcc/attribs.c +++ b/gcc/attribs.c @@ -1664,7 +1664,7 @@ handle_dll_attribute (tree * pnode, tree name, tree args, int flags, && DECL_DECLARED_INLINE_P (node)) { warning (OPT_Wattributes, "inline function %q+D declared as " - " dllimport: attribute ignored", node); + "dllimport: attribute ignored", node); *no_add_attrs = true; } /* Like MS, treat definition of dllimported variables and diff --git a/gcc/config/avr/avr-devices.c b/gcc/config/avr/avr-devices.c index e6ced292706..8688675341b 100644 --- a/gcc/config/avr/avr-devices.c +++ b/gcc/config/avr/avr-devices.c @@ -76,7 +76,7 @@ avr_texinfo[] = "the @code{MOVW} instruction." }, { ARCH_AVR3, "``Classic'' devices with 16@tie{}KiB up to 64@tie{}KiB of " - " program memory." }, + "program memory." }, { ARCH_AVR31, "``Classic'' devices with 128@tie{}KiB of program memory." }, { ARCH_AVR35, diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 43184b08cd3..2d58add34ad 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,10 @@ 2019-03-08 Jakub Jelinek + PR other/80058 + * parser.c (cp_parser_template_declaration_after_parameters): Avoid + one space before " at the end of line and another after " on another + line in a string literal. + PR tree-optimization/89550 * semantics.c (maybe_convert_cond): Only set TREE_NO_WARNING if warning_at returned true. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index e6c2036ab33..de2dd30d94e 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -27865,7 +27865,7 @@ cp_parser_template_declaration_after_parameters (cp_parser* parser, if (cxx_dialect > cxx17) error ("literal operator template %qD has invalid parameter list;" " Expected non-type template parameter pack " - " or single non-type parameter of class type", + "or single non-type parameter of class type", decl); else error ("literal operator template %qD has invalid parameter list." diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 2b23b997c6d..28403689bb1 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2019-03-08 Jakub Jelinek + + PR other/80058 + * arith.c (gfc_complex2complex): Avoid two spaces in the middle of + diagnostics. + * resolve.c (resolve_allocate_expr): Likewise. + 2019-03-06 Harald Anlauf PR fortran/71203 diff --git a/gcc/fortran/arith.c b/gcc/fortran/arith.c index 52d3a38b646..f2d311c044c 100644 --- a/gcc/fortran/arith.c +++ b/gcc/fortran/arith.c @@ -2472,7 +2472,7 @@ gfc_complex2complex (gfc_expr *src, int kind) int w = warn_conversion ? OPT_Wconversion : OPT_Wconversion_extra; gfc_warning_now (w, "Change of value in conversion from " - " %qs to %qs at %L", + "%qs to %qs at %L", gfc_typename (&src->ts), gfc_typename (&result->ts), &src->where); did_warn = true; diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 955978bf1ec..1cf9cbae964 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -7798,7 +7798,7 @@ resolve_allocate_expr (gfc_expr *e, gfc_code *code, bool *array_alloc_wo_spec) if (mpz_cmp_si (ar->start[i]->value.integer, 1) < 0) { gfc_error ("Upper cobound is less than lower cobound " - " of 1 at %L", &ar->start[i]->where); + "of 1 at %L", &ar->start[i]->where); goto failure; } } diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c index 629dc5dae1f..afbd5d004ba 100644 --- a/gcc/lra-constraints.c +++ b/gcc/lra-constraints.c @@ -2681,7 +2681,7 @@ process_alt_operands (int only_alternative) if (lra_dump_file != NULL) fprintf (lra_dump_file, " alt=%d: reload pseudo for op %d " - " cannot hold the mode value -- refuse\n", + "cannot hold the mode value -- refuse\n", nalt, nop); goto fail; } -- 2.30.2