From 20360e4b6b5a63bc65d1855a7ecf22eb7148a452 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sat, 22 Mar 2025 08:39:38 +0100 Subject: Fix up some further cases of missing or extraneous spaces in diagnostics Given the recent PR119406 I've tried to grep for concatenated string literals without space at the end of one line and at the start of next line, unless it was obviously intentional. Furthermore, I've then looked through gcc.pot looking for 2 adjacent spaces and looking back if that wasn't the case of "something " " with spaces at both sides". Here is the result from that. I think just the c.opt change needs an explanation, the "" in the description is simply eaten up somewhere during the option processing and gcc -v --help before this patch was displaying -Wdeprecated-literal-operator Warn about deprecated space between and suffix in a user-defined literal operator. 2025-03-22 Jakub Jelinek gcc/ * gimplify.cc (warn_switch_unreachable_and_auto_init_r): Add missing space in the middle of diagnostics. * tree-vect-stmts.cc (vectorizable_load): Add missing space in the middle of debug dump message. * sym-exec/sym-exec-state.cc (state::check_args_compatibility): Likewise. gcc/c-family/ * c.opt (Wdeprecated-literal-operator): Use \"\" rather than "" in option description. gcc/fortran/ * resolve.cc (resolve_procedure_expression): Remove extraneous space from the middle of diagnostics. --- gcc/c-family/c.opt | 2 +- gcc/fortran/resolve.cc | 2 +- gcc/gimplify.cc | 2 +- gcc/sym-exec/sym-exec-state.cc | 2 +- gcc/tree-vect-stmts.cc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'gcc') diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt index 6c6922a..ad21698 100644 --- a/gcc/c-family/c.opt +++ b/gcc/c-family/c.opt @@ -666,7 +666,7 @@ type and the other is of a floating-point type. Wdeprecated-literal-operator C++ ObjC++ Var(warn_deprecated_literal_operator) Warning -Warn about deprecated space between "" and suffix in a user-defined literal operator. +Warn about deprecated space between \"\" and suffix in a user-defined literal operator. Wdeprecated-non-prototype C ObjC Var(warn_deprecated_non_prototype) Init(-1) Warning diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc index e016865..cf9318f 100644 --- a/gcc/fortran/resolve.cc +++ b/gcc/fortran/resolve.cc @@ -1986,7 +1986,7 @@ resolve_procedure_expression (gfc_expr* expr) if (is_illegal_recursion (sym, gfc_current_ns)) { if (sym->attr.use_assoc && expr->symtree->name[0] == '@') - gfc_warning (0, "Non-RECURSIVE procedure %qs from module %qs is " + gfc_warning (0, "Non-RECURSIVE procedure %qs from module %qs is" " possibly calling itself recursively in procedure %qs. " " Declare it RECURSIVE or use %<-frecursive%>", sym->name, sym->module, gfc_current_ns->proc_name->name); diff --git a/gcc/gimplify.cc b/gcc/gimplify.cc index 244c4ba..354c3d6 100644 --- a/gcc/gimplify.cc +++ b/gcc/gimplify.cc @@ -2395,7 +2395,7 @@ warn_switch_unreachable_and_auto_init_r (gimple_stmt_iterator *gsi_p, const char *var_name_str = TREE_STRING_POINTER (var_name); warning_at (gimple_location (stmt), OPT_Wtrivial_auto_var_init, - "%qs cannot be initialized with" + "%qs cannot be initialized with " "%<-ftrivial-auto-var_init%>", var_name_str); break; diff --git a/gcc/sym-exec/sym-exec-state.cc b/gcc/sym-exec/sym-exec-state.cc index fb7495a..d5cbb73 100644 --- a/gcc/sym-exec/sym-exec-state.cc +++ b/gcc/sym-exec/sym-exec-state.cc @@ -265,7 +265,7 @@ state::check_args_compatibility (tree arg1, tree arg2, tree dest) || TREE_CODE (arg2) == INTEGER_CST)) { if (dump_file && (dump_flags & TDF_DETAILS)) - fprintf (dump_file, "Sym-Exec: Incompatible destination" + fprintf (dump_file, "Sym-Exec: Incompatible destination " "and argument sizes.\n"); return false; diff --git a/gcc/tree-vect-stmts.cc b/gcc/tree-vect-stmts.cc index 17e3b1d..813b2b7 100644 --- a/gcc/tree-vect-stmts.cc +++ b/gcc/tree-vect-stmts.cc @@ -12576,7 +12576,7 @@ vectorizable_load (vec_info *vinfo, if (dump_enabled_p ()) dump_printf_loc (MSG_NOTE, vect_location, - "vect_model_load_cost:" + "vect_model_load_cost: " "strided group_size = %d .\n", group_size); } -- cgit v1.1