From patchwork Tue May 14 21:33:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Sebor X-Patchwork-Id: 1099746 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-500694-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="ILM9yuYB"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="auYwi2Nx"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 453WCl4c7dz9sNQ for ; Wed, 15 May 2019 07:34:11 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=NQaooAR+PokMrLswFkOYRLTKAXlS2vr+5wTQ/AydDWjDfovBUZ e7eDAdJRBJgqQ0CSvI0WqhwPT1qL6Sw/DcFcPY/ie0pV7vyTw1b7gtQbPIJgKS+v qL+Ol48vOlNuBVzVEEO5fSqB2SEHfj+EW7Pb8WUa3xQPLd+aYYwEiNc0k= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=Pif55eglYUJUqnvx5edFBHZ+0m0=; b=ILM9yuYBPJR20qmHX5oI C03x36QUArAB6w6El2hNFrkBMbclMWnd1tD32mBzzjYsDIHLv/v8xWv8XOSnyzRh 888XMbj/MqlgnstRTOQfOqWUtzYKONFbw34zAzFIg7f9HcmGtmTUaORWp0noLPnR E7Bto6HKIAFwt4dVPLTKOLk= Received: (qmail 43232 invoked by alias); 14 May 2019 21:33:10 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 43181 invoked by uid 89); 14 May 2019 21:33:09 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.5 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS, T_FILL_THIS_FORM_SHORT autolearn=ham version=3.3.1 spammy= X-HELO: mail-qk1-f179.google.com Received: from mail-qk1-f179.google.com (HELO mail-qk1-f179.google.com) (209.85.222.179) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 14 May 2019 21:33:06 +0000 Received: by mail-qk1-f179.google.com with SMTP id w20so209623qka.7 for ; Tue, 14 May 2019 14:33:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=FN+v1QX4IbjwOinYiPtIqeSMlaeDV2TYG3hUQuiOkMg=; b=auYwi2NxlyYSW2yerUWg5uBI1J35KGTqM5Bj4New3c1k7axxyV6eFQ6/ZpNqOHMygM YWFWz9z1C6Amj4ged3uiO29YqvKvyu8chptQh+MtHwBVv2x6N3Q+XMmeIvTMi1hgo19Z DtiXqoDjzUsKoU7ejcEfkulof+mCLcv6eKLEfOLvGSpp10ssGy8nohVfUJJJVBfDRPvg /X40tukBTUL01bSrKMzlYbN/tnYL1e+soo8mYOKx+NlsX/+f0Bycgz2P5gSWaW1+CAKU 6KlWcdrljmYTwTePCdLQFutkJF+rp0gJXO6QbL7GsqjgMCGeTdJhjUMTDv6RMs3E6SiV FzYA== Received: from [192.168.0.41] (97-118-125-210.hlrn.qwest.net. [97.118.125.210]) by smtp.gmail.com with ESMTPSA id b22sm105895qtc.37.2019.05.14.14.33.03 for (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Tue, 14 May 2019 14:33:04 -0700 (PDT) To: gcc-patches From: Martin Sebor Subject: [PATCH 10/12] fix diagnostic quoting/spelling in D Message-ID: <84117ded-97b1-5539-6d6e-c0ac653d5d69@gmail.com> Date: Tue, 14 May 2019 15:33:03 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.3.1 MIME-Version: 1.0 X-IsSubscribed: yes The attached patch fixes quoting, spelling, and other formatting issues in diagnostics issued by the D front end and pointed out by the -Wformat-diag warning. Martin gcc/d/ChangeLog: * d/d-builtins.cc (d_init_builtins): Quote keywords, operators, and types in diagnostics. * d/d-codegen.cc (get_array_length): Same. Replace can't with cannot. * d/d-convert.cc (convert_expr): Same. * d/d-frontend.cc (getTypeInfoType): Quote an option name in a diagnostic. * d/d-lang.cc (d_handle_option): Same. (d_parse_file): Same. * d/decl.cc: Remove a trailing period from a diagnostic. * d/expr.cc: Use a directive for an apostrophe. * d/toir.cc: Quote keywords, operators, and types in diagnostics. * d/typeinfo.cc (build_typeinfo): Quote an option name in a diagnostic. diff --git a/gcc/d/d-builtins.cc b/gcc/d/d-builtins.cc index 3dbdafb492a..3ebee721a25 100644 --- a/gcc/d/d-builtins.cc +++ b/gcc/d/d-builtins.cc @@ -1117,7 +1117,7 @@ d_init_builtins (void) Type::tvalist = build_frontend_type (va_list_type_node); if (!Type::tvalist) { - error ("cannot represent built-in va_list type in D"); + error ("cannot represent built-in % type in D"); gcc_unreachable (); } diff --git a/gcc/d/d-codegen.cc b/gcc/d/d-codegen.cc index 2abff92fc88..1971064e334 100644 --- a/gcc/d/d-codegen.cc +++ b/gcc/d/d-codegen.cc @@ -316,7 +316,7 @@ get_array_length (tree exp, Type *type) return d_array_length (exp); default: - error ("can't determine the length of a %qs", type->toChars ()); + error ("cannot determine the length of a %qs", type->toChars ()); return error_mark_node; } } diff --git a/gcc/d/d-convert.cc b/gcc/d/d-convert.cc index e9aa457d852..b020eab902f 100644 --- a/gcc/d/d-convert.cc +++ b/gcc/d/d-convert.cc @@ -376,7 +376,7 @@ convert_expr (tree exp, Type *etype, Type *totype) } else { - error ("can't convert a delegate expression to %qs", + error ("cannot convert a delegate expression to %qs", totype->toChars ()); return error_mark_node; } @@ -392,7 +392,7 @@ convert_expr (tree exp, Type *etype, Type *totype) } else { - error ("can't convert struct %qs to %qs", + error ("cannot convert struct %qs to %qs", etype->toChars (), totype->toChars ()); return error_mark_node; } @@ -475,7 +475,7 @@ convert_expr (tree exp, Type *etype, Type *totype) if ((dim * esize) % tsize != 0) { - error ("cannot cast %qs to %qs since sizes don't line up", + error ("cannot cast %qs to %qs since sizes do not line up", etype->toChars (), totype->toChars ()); return error_mark_node; } diff --git a/gcc/d/d-frontend.cc b/gcc/d/d-frontend.cc index ccd5f50130f..77b6f22d824 100644 --- a/gcc/d/d-frontend.cc +++ b/gcc/d/d-frontend.cc @@ -625,7 +625,7 @@ getTypeInfoType (Loc loc, Type *type, Scope *sc) if (!warned) { error_at (make_location_t (loc), - "% cannot be used with -fno-rtti"); + "% cannot be used with %<-fno-rtti%>"); warned = 1; } } diff --git a/gcc/d/d-lang.cc b/gcc/d/d-lang.cc index 62a8ddd69b2..f23f719a2c3 100644 --- a/gcc/d/d-lang.cc +++ b/gcc/d/d-lang.cc @@ -449,7 +449,7 @@ d_handle_option (size_t scode, const char *arg, HOST_WIDE_INT value, break; } - error ("bad argument for -fdebug %qs", arg); + error ("bad argument for %<-fdebug%>: %qs", arg); break; case OPT_fdoc: @@ -497,7 +497,7 @@ d_handle_option (size_t scode, const char *arg, HOST_WIDE_INT value, case OPT_fmodule_file_: global.params.modFileAliasStrings->push (arg); if (!strchr (arg, '=')) - error ("bad argument for -fmodule-file %qs", arg); + error ("bad argument for %<-fmodule-file%>: %qs", arg); break; case OPT_fmoduleinfo: @@ -588,7 +588,7 @@ d_handle_option (size_t scode, const char *arg, HOST_WIDE_INT value, break; } - error ("bad argument for -fversion %qs", arg); + error ("bad argument for %<-fversion%>: %qs", arg); break; case OPT_H: @@ -1011,7 +1011,7 @@ d_parse_file (void) /* In this mode, the first file name is supposed to be a duplicate of one of the input files. */ if (d_option.fonly && strcmp (d_option.fonly, main_input_filename) != 0) - error ("-fonly= argument is different from first input file name"); + error ("%<-fonly=%> argument is different from first input file name"); for (size_t i = 0; i < num_in_fnames; i++) { diff --git a/gcc/d/decl.cc b/gcc/d/decl.cc index 49723649230..bcce245e59c 100644 --- a/gcc/d/decl.cc +++ b/gcc/d/decl.cc @@ -463,7 +463,7 @@ public: fd2->toPrettyChars ()); inform (make_location_t (d->loc), "use % to introduce base class " - "overload set.", fd->toChars (), + "overload set", fd->toChars (), fd->parent->toChars (), fd->toChars ()); } else diff --git a/gcc/d/expr.cc b/gcc/d/expr.cc index 6497619e5fd..826c32a059f 100644 --- a/gcc/d/expr.cc +++ b/gcc/d/expr.cc @@ -1522,7 +1522,7 @@ public: } else { - error ("don't know how to delete %qs", e->e1->toChars ()); + error ("don%'t know how to delete %qs", e->e1->toChars ()); this->result_ = error_mark_node; } } diff --git a/gcc/d/toir.cc b/gcc/d/toir.cc index f1b2e09a94d..1d125b43962 100644 --- a/gcc/d/toir.cc +++ b/gcc/d/toir.cc @@ -367,9 +367,11 @@ public: } if (ent->in_try_scope) - error_at (make_location_t (from->loc), "cannot goto into try block"); + error_at (make_location_t (from->loc), + "cannot % into % block"); else if (ent->in_catch_scope) - error_at (make_location_t (from->loc), "cannot goto into catch block"); + error_at (make_location_t (from->loc), + "cannot % into % block"); } /* Check that a previously seen jump to a newly defined label is valid. @@ -391,21 +393,21 @@ public: { location = make_location_t (fwdref->statement->loc); if (b->kind == level_try) - error_at (location, "cannot goto into try block"); + error_at (location, "cannot % into % block"); else - error_at (location, "cannot goto into catch block"); + error_at (location, "cannot % into % block"); } else if (s->isCaseStatement ()) { location = make_location_t (s->loc); error_at (location, "case cannot be in different " - "try block level from switch"); + "% block level from %"); } else if (s->isDefaultStatement ()) { location = make_location_t (s->loc); error_at (location, "default cannot be in different " - "try block level from switch"); + "% block level from %"); } else gcc_unreachable (); @@ -1125,8 +1127,8 @@ public: static int warned = 0; if (!warned) { - error_at (make_location_t (s->loc), "exception handling disabled, " - "use -fexceptions to enable"); + error_at (make_location_t (s->loc), "exception handling disabled; " + "use %<-fexceptions%> to enable"); warned = 1; } } diff --git a/gcc/d/typeinfo.cc b/gcc/d/typeinfo.cc index bbd3961181d..58c6ce1ba3c 100644 --- a/gcc/d/typeinfo.cc +++ b/gcc/d/typeinfo.cc @@ -1350,7 +1350,7 @@ build_typeinfo (const Loc &loc, Type *type) if (!warned) { error_at (make_location_t (loc), - "% cannot be used with -fno-rtti"); + "% cannot be used with %<-fno-rtti%>"); warned = 1; } }