From patchwork Sat Dec 3 20:24:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 29340 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1514227wrr; Sat, 3 Dec 2022 12:39:26 -0800 (PST) X-Google-Smtp-Source: AA0mqf5ex5DEXxNGr2lW4nIEvSj/0u60tCuOkjl2xdrGP3rwE6CiVjW20pd9A3V5Jh0NWiHbWV/H X-Received: by 2002:a50:eb8f:0:b0:46c:5a22:b00c with SMTP id y15-20020a50eb8f000000b0046c5a22b00cmr3519171edr.46.1670099966679; Sat, 03 Dec 2022 12:39:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670099966; cv=none; d=google.com; s=arc-20160816; b=RGNSoczLJJr0cfuS/hqwB9VwTDjuoKCG8iV5mnsuRI1VMJMFkL/BBT+K5JDuZ8wmJF QG0CBbM7PFKfFk9G/xC9lawqXFWzrRXNbAq6AlcBTXkd249rrUEqoyaq9KDZLyhPuhFw rWPDc5v3kGkjh7DpSj+mHLcaO9ie42Wgv60dIci1dimliINKO5Ys5jDT+lrv4YpU6zBt 3qyfzTZGi6y4taTfVAqsNByXK/7A2ZWa7stdRc1JswOBxOkgRkeUm3l+rh2iEpP4OX16 9sVVCJJEDe/JUu+72Z2TRoiJW95DzYW7cKANXZH3aykyHWWWg2nD6FCM45a+ZIKJeM0W UOFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:ui-outboundreport :sensitivity:importance:date:subject:to:message-id:mime-version :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=dhn6szpBbR0W4S+Hj817cyYNr/frg5WKO1MstLvtDm0=; b=JEaAHOMQzP0vrKM2JIibRngmAlcyIe4G4nr1RnOlb6djErtEVHSd8po7K+9sGsdPxv h5wL5YlmULQA5+Wdu0kNyDknhOWImHPSkVH0gQxVD/biDhH/BA9ye3TMb+d9fmrEq1O9 aaoolMTDoE/Wf3GlfB+qQ05tS9ONovP1x6ZdYZ+kfb4alMt4R1sefcdjp5SEgV4Wv3en 97Ly3aDbVa5hr2vNiCJjAlF5xxbg1vDR+I+51cO45bFiHYw6PIALELSby9tBsNE4NNyK hn77kJY1GLqASOFoRFHnJMrqoXITHBg0zwPmV1LIy9BOzuEPBxCiCUCrSKe4GvZo0j8P Qwgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=xhwiGBLz; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id qf30-20020a1709077f1e00b007ae72eabbe0si3729313ejc.928.2022.12.03.12.39.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Dec 2022 12:39:26 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=xhwiGBLz; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A117D395BC17 for ; Sat, 3 Dec 2022 20:32:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A117D395BC17 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670099548; bh=dhn6szpBbR0W4S+Hj817cyYNr/frg5WKO1MstLvtDm0=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=xhwiGBLzNmLMmzzXRl3JSttksaEYzPYAVpqIxwk4QbULPnBVrG+cJDm1XlBE2jFcL uqCZIgTuvbOMSxhpj5Hm7DIi+JaL4XNHX3Oh8JChM0LJ9tle/zEgo2ho48AMxc54wF +CMg/Tvm0Phos5vOIfyZPbayqIxkLVUujO4MXUAQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by sourceware.org (Postfix) with ESMTPS id A1A6938582A3; Sat, 3 Dec 2022 20:24:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A1A6938582A3 X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [93.207.85.95] ([93.207.85.95]) by web-mail.gmx.net (3c-app-gmx-bs13.server.lan [172.19.170.65]) (via HTTP); Sat, 3 Dec 2022 21:24:22 +0100 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] Fortran: fix typo in documentation of intrinsic FLOOR [PR107870] Date: Sat, 3 Dec 2022 21:24:22 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:M094HJQKGzcdqVsYUPYnvQewkB8v4sYiwyOflVe/CGpcOvP4ce4ISaLXlkXhZVxT/eqcd jfaQZgLW8Nlh1rl9+g9WSIlG5MLsIXkY2acyMEkFexmpVR9g7q3f6i++8S0Xf0RUVbCt7jP5r75k 5GLCldQjlaiDUB2wuzia3cwiPEWNPTBQXTKMacEnyEK2iT3a6NgjiANjiyYiD3eAmZdnTzqQ43Jo yYMA35B0Dk+afzRhkKan4nek1EqGUBQsaHzGVq/P9cDtwkcLlpSrOCLEU+iabmPSe5OV+5d0/oNa 5U= UI-OutboundReport: notjunk:1;M01:P0:RskW52f6gd0=;roVXKR3Euy9CMK5273BPAi4Unzq /C6KQ5eZ6zaURzRFbkmHSGHtMv5a8Y+DB4qNWkp5yGTqEph3as4AuE0+k3d0tKnypFGE5V3+f VEP6EXNw6SFEBE1CRC1cMERJzKo4msaID19ZTcyp3xVH6Jk/0szJfg9MDfZ86fSFDP6sM1Ir8 hNinCCJAm2/DcXKcZD/KiLaPCIT6grG4kGk7Yk/Und488GeUl/01tVwWlUBj1skeH4gmy4eIx 3In45TAaLCSi7J9G/ApicoyPSCQ28sTyWpAJSV47sVrxRPy7gTQW1y6rVDu/u7LFLPMrcQzxC vVBVBlqwqHE6whILyeF0gFuMkQ8+QjqnBIgFh145DSuWJXY30wLndmwDTVDFHJLirI5YAng/g OW8MRHmQq18PiSI3vXsPhwxXqqT3mW9f6ZtLaU7o7+SpcZioSAISIBJqXPuVpNmG47DzC9xa1 ILn1ptjWwIWsv+kcGcDAWLTvJdlk0zOh9YJ2Et103ChXAjwhuefgbUyAYBtmvQxZwgYBn2JdK CjzUWoyjM1cx4hXny04ycy9foz4mCyQJen99l79CMqAwkClKI+UbxubgFLlhjk7GBpXUH9Qil MiXPCc9zWbWljqa4Gm4qX06XBxRmgmv8uFrRugAIq473dOH9wb3xZQ5xDbJZhis7+I25+WC7b z4nmVWaIwpazNFAOYOcVU/p505VouZJYWgKu0urUe0SPE+VB+2/SP0jTvH93xEmLb5ZSP3bp/ jmCHYoven2dpe3eK8j8IC059bNQ+G8lAX6UafhPicdX/xUEWJHvTAk1tdWTp3iw+D8fJptwAd pskJeS6rpd+BUFSg01xPbG7goCrTI6oXQBve+auV3+m8k= X-Spam-Status: No, score=-13.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Harald Anlauf via Gcc-patches From: Harald Anlauf Reply-To: Harald Anlauf Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751226742904507036?= X-GMAIL-MSGID: =?utf-8?q?1751226742904507036?= Dear all, here's a small documentation fix for the intrinsic FLOOR. Besides that, I adjusted the description of the optional KIND argument to Fortran intrinsics to conform to the F2018 standard, which reads "scalar integer constant expression". Tested with "make dvi". OK for mainline? Thanks, Harald From 2ad9a19b1cfc0bd9c71d10894f9aca2532f88db4 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Sat, 3 Dec 2022 21:13:48 +0100 Subject: [PATCH] Fortran: fix typo in documentation of intrinsic FLOOR [PR107870] gcc/fortran/ChangeLog: PR fortran/107870 * intrinsic.texi: Fix typo in documentation of intrinsic FLOOR. Describe the optional KIND argument to intrinsics as a scalar constant expression, in accordance with the current standard. --- gcc/fortran/intrinsic.texi | 60 +++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/gcc/fortran/intrinsic.texi b/gcc/fortran/intrinsic.texi index 55f53fc1137..7af1ca3eae6 100644 --- a/gcc/fortran/intrinsic.texi +++ b/gcc/fortran/intrinsic.texi @@ -553,7 +553,7 @@ Elemental function @item @emph{Arguments}: @multitable @columnfractions .15 .70 @item @var{I} @tab The type shall be @code{INTEGER}. -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -920,7 +920,7 @@ Elemental function @item @emph{Arguments}: @multitable @columnfractions .15 .70 @item @var{A} @tab The type of the argument shall be @code{REAL}. -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -1202,7 +1202,7 @@ Elemental function @item @emph{Arguments}: @multitable @columnfractions .15 .70 @item @var{A} @tab The type of the argument shall be @code{REAL}. -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -3406,7 +3406,7 @@ Elemental function @item @emph{Arguments}: @multitable @columnfractions .15 .70 @item @var{A} @tab The type shall be @code{REAL}. -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -3452,7 +3452,7 @@ Elemental function @item @emph{Arguments}: @multitable @columnfractions .15 .70 @item @var{I} @tab The type shall be @code{INTEGER}. -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -3636,7 +3636,7 @@ Elemental function or @code{COMPLEX}. @item @var{Y} @tab (Optional; only allowed if @var{X} is not @code{COMPLEX}.) May be @code{INTEGER} or @code{REAL}. -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -4527,7 +4527,7 @@ Transformational function @multitable @columnfractions .15 .70 @item @var{MASK} @tab The type shall be @code{LOGICAL}. @item @var{DIM} @tab (Optional) The type shall be @code{INTEGER}. -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -6186,7 +6186,7 @@ conformance with @var{ARRAY}. inclusive. It may not be an optional dummy argument. @item @var{MASK} @tab (Optional) Shall be of type @code{LOGICAL}, and conformable with @var{ARRAY}. -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @item @var{BACK} @tab (Optional) A scalar of type @code{LOGICAL}. @end multitable @@ -6215,7 +6215,7 @@ is of default kind. @table @asis @item @emph{Description}: -@code{FLOOR(A)} returns the greatest integer less than or equal to @var{X}. +@code{FLOOR(A)} returns the greatest integer less than or equal to @var{A}. @item @emph{Standard}: Fortran 95 and later @@ -6229,7 +6229,7 @@ Elemental function @item @emph{Arguments}: @multitable @columnfractions .15 .70 @item @var{A} @tab The type shall be @code{REAL}. -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -7550,7 +7550,7 @@ Elemental function @item @emph{Arguments}: @multitable @columnfractions .15 .70 @item @var{C} @tab Shall be a scalar @code{CHARACTER}, with @code{INTENT(IN)} -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -8007,7 +8007,7 @@ Elemental function @item @emph{Arguments}: @multitable @columnfractions .15 .70 @item @var{C} @tab Shall be a scalar @code{CHARACTER}, with @code{INTENT(IN)} -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -8279,7 +8279,7 @@ Elemental function @code{INTENT(IN)} @item @var{BACK} @tab (Optional) Shall be a scalar @code{LOGICAL}, with @code{INTENT(IN)} -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -8324,7 +8324,7 @@ Elemental function @multitable @columnfractions .15 .70 @item @var{A} @tab Shall be of type @code{INTEGER}, @code{REAL}, or @code{COMPLEX} or a boz-literal-constant. -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -9109,7 +9109,7 @@ Inquiry function @multitable @columnfractions .15 .70 @item @var{ARRAY} @tab Shall be an array, of any type. @item @var{DIM} @tab (Optional) Shall be a scalar @code{INTEGER}. -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -9152,7 +9152,7 @@ Inquiry function @multitable @columnfractions .15 .70 @item @var{ARRAY} @tab Shall be an coarray, of any type. @item @var{DIM} @tab (Optional) Shall be a scalar @code{INTEGER}. -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -9239,7 +9239,7 @@ Inquiry function @multitable @columnfractions .15 .70 @item @var{STRING} @tab Shall be a scalar or array of type @code{CHARACTER}, with @code{INTENT(IN)} -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -9285,7 +9285,7 @@ Elemental function @multitable @columnfractions .15 .70 @item @var{STRING} @tab Shall be a scalar of type @code{CHARACTER}, with @code{INTENT(IN)} -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -9823,7 +9823,7 @@ Elemental function @item @emph{Arguments}: @multitable @columnfractions .15 .70 @item @var{L} @tab The type shall be @code{LOGICAL}. -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -10312,7 +10312,7 @@ Transformational function inclusive. It may not be an optional dummy argument. @item @var{MASK} @tab Shall be of type @code{LOGICAL}, and conformable with @var{ARRAY}. -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @item @var{BACK} @tab (Optional) A scalar of type @code{LOGICAL}. @end multitable @@ -10679,7 +10679,7 @@ Transformational function inclusive. It may not be an optional dummy argument. @item @var{MASK} @tab Shall be of type @code{LOGICAL}, and conformable with @var{ARRAY}. -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @item @var{BACK} @tab (Optional) A scalar of type @code{LOGICAL}. @end multitable @@ -11111,7 +11111,7 @@ Elemental function @item @emph{Arguments}: @multitable @columnfractions .15 .70 @item @var{A} @tab The type of the argument shall be @code{REAL}. -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -12216,7 +12216,7 @@ Elemental function @multitable @columnfractions .15 .70 @item @var{A} @tab Shall be @code{INTEGER}, @code{REAL}, or @code{COMPLEX}. -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -12594,7 +12594,7 @@ Elemental function @item @var{STRING} @tab Shall be of type @code{CHARACTER}. @item @var{SET} @tab Shall be of type @code{CHARACTER}. @item @var{BACK} @tab (Optional) shall be of type @code{LOGICAL}. -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -12956,7 +12956,7 @@ Inquiry function @item @var{SOURCE} @tab Shall be an array or scalar of any type. If @var{SOURCE} is a pointer it must be associated and allocatable arrays must be allocated. -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -13417,7 +13417,7 @@ a pointer it must be associated and allocatable arrays must be allocated. @item @var{DIM} @tab (Optional) shall be a scalar of type @code{INTEGER} and its value shall be in the range from 1 to n, where n equals the rank of @var{ARRAY}. -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -14680,8 +14680,8 @@ Inquiry function @item @emph{Arguments}: @multitable @columnfractions .15 .70 @item @var{ARRAY} @tab Shall be an array, of any type. -@item @var{DIM} @tab (Optional) Shall be a scalar @code{INTEGER}. -@item @var{KIND}@tab (Optional) An @code{INTEGER} initialization +@item @var{DIM} @tab (Optional) Shall be a scalar @code{INTEGER}. +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -14725,7 +14725,7 @@ Inquiry function @multitable @columnfractions .15 .70 @item @var{ARRAY} @tab Shall be an coarray, of any type. @item @var{DIM} @tab (Optional) Shall be a scalar @code{INTEGER}. -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable @@ -14900,7 +14900,7 @@ Elemental function @item @var{STRING} @tab Shall be of type @code{CHARACTER}. @item @var{SET} @tab Shall be of type @code{CHARACTER}. @item @var{BACK} @tab (Optional) shall be of type @code{LOGICAL}. -@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +@item @var{KIND} @tab (Optional) A scalar @code{INTEGER} constant expression indicating the kind parameter of the result. @end multitable -- 2.35.3