From patchwork Mon Dec 11 20:28:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Koenig X-Patchwork-Id: 847208 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-468942-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="ElA7vMGV"; 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 3ywZKq6dvLz9t30 for ; Tue, 12 Dec 2017 07:28:44 +1100 (AEDT) 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=Dyo3pp8KRAET99YcbMl28I5RXseK44aD+gAhRUpXpQWEEar6BJ 24VPJ/gKlHg5X+QqX5gZja91CQSXzs7oX2Pn18257g0JQxXunLAzHArzUGkv01wc DRF+jg/BlSDT51ccKe5EGkbb2+HngqAfbn9gsdGSGqX6IHEG+E+KVqexg= 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=2AaHbCKPb3fpYzE2wOX92iRdgo0=; b=ElA7vMGV4cb5Lwuf4mZq Tdk3dChA0BDSRI0BQkuvdeGW3Q+bDRAudQu/jzKj4dH7yQUGeflpfFH0RrUt/Xx9 2PTjFymHLCB5ipos6Z2tEYEQszEcWVIRbLniFfBk8ZxjbntGuPTXYh2eGVjtIkRr +kCJcrYE71fjv1UHXlWC7Q0= Received: (qmail 106823 invoked by alias); 11 Dec 2017 20:28:30 -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 106791 invoked by uid 89); 11 Dec 2017 20:28:29 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=100078, sk:Transfo X-Spam-User: qpsmtpd, 2 recipients X-HELO: cc-smtpout1.netcologne.de Received: from cc-smtpout1.netcologne.de (HELO cc-smtpout1.netcologne.de) (89.1.8.211) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 11 Dec 2017 20:28:27 +0000 Received: from cc-smtpin3.netcologne.de (cc-smtpin3.netcologne.de [89.1.8.203]) by cc-smtpout1.netcologne.de (Postfix) with ESMTP id 26D20133FA; Mon, 11 Dec 2017 21:28:24 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by cc-smtpin3.netcologne.de (Postfix) with ESMTP id 19AD111D83; Mon, 11 Dec 2017 21:28:24 +0100 (CET) Received: from [78.35.159.112] (helo=cc-smtpin3.netcologne.de) by localhost with ESMTP (eXpurgate 4.1.9) (envelope-from ) id 5a2eea68-02b7-7f0000012729-7f0000019095-1 for ; Mon, 11 Dec 2017 21:28:24 +0100 Received: from [192.168.178.20] (xdsl-78-35-159-112.netcologne.de [78.35.159.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by cc-smtpin3.netcologne.de (Postfix) with ESMTPSA; Mon, 11 Dec 2017 21:28:22 +0100 (CET) To: "fortran@gcc.gnu.org" , gcc-patches From: Thomas Koenig Subject: [patch, fortran, doc, committed] Update description of MINLOC and MAXLOC Message-ID: <7cf67653-b5b9-069f-144f-f03dbe2ab183@netcologne.de> Date: Mon, 11 Dec 2017 21:28:22 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 Hi, I have just committed the attached doc patch as obvious after "make dvi" and "make pdf". 2017-12-11 Thomas Koenig * intrinsic.texi (MAXLOC): Update documentation for character arrays and KIND argument. (MINLOC): Likewise. Regards Thomas Index: intrinsic.texi =================================================================== --- intrinsic.texi (Revision 255545) +++ intrinsic.texi (Arbeitskopie) @@ -9994,10 +9994,13 @@ that of the first such element in array element or zero size, or all of the elements of @var{MASK} are @code{.FALSE.}, then the result is an array of zeroes. Similarly, if @var{DIM} is supplied and all of the elements of @var{MASK} along a given row are zero, the -result value for that row is zero. +result value for that row is zero. If the optional argument @var{KIND} +is present, the result is an integer of kind @var{KIND}, otherwise it is of +default kind. @item @emph{Standard}: -Fortran 95 and later +Fortran 95 and later; @var{ARRAY} of @code{CHARACTER} and the +@var{KIND} argument are available in Fortran 2003 and later. @item @emph{Class}: Transformational function @@ -10004,8 +10007,8 @@ Transformational function @item @emph{Syntax}: @multitable @columnfractions .80 -@item @code{RESULT = MAXLOC(ARRAY, DIM [, MASK])} -@item @code{RESULT = MAXLOC(ARRAY [, MASK])} +@item @code{RESULT = MAXLOC(ARRAY, DIM [, MASK] [,KIND])} +@item @code{RESULT = MAXLOC(ARRAY [, MASK] [,KIND])} @end multitable @item @emph{Arguments}: @@ -10017,6 +10020,8 @@ Transformational function inclusive. It may not be an optional dummy argument. @item @var{MASK} @tab Shall be an array of type @code{LOGICAL}, and conformable with @var{ARRAY}. +@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +expression indicating the kind parameter of the result. @end multitable @item @emph{Return value}: @@ -10342,10 +10347,13 @@ that of the first such element in array element or zero size, or all of the elements of @var{MASK} are @code{.FALSE.}, then the result is an array of zeroes. Similarly, if @var{DIM} is supplied and all of the elements of @var{MASK} along a given row are zero, the -result value for that row is zero. +result value for that row is zero. If the optional argument @var{KIND} +is present, the result is an integer of kind @var{KIND}, otherwise it is of +default kind. @item @emph{Standard}: -Fortran 95 and later +Fortran 95 and later; @var{ARRAY} of @code{CHARACTER} and the +@var{KIND} argument are available in Fortran 2003 and later. @item @emph{Class}: Transformational function @@ -10352,19 +10360,21 @@ Transformational function @item @emph{Syntax}: @multitable @columnfractions .80 -@item @code{RESULT = MINLOC(ARRAY, DIM [, MASK])} -@item @code{RESULT = MINLOC(ARRAY [, MASK])} +@item @code{RESULT = MINLOC(ARRAY, DIM [, MASK] [,KIND])} +@item @code{RESULT = MINLOC(ARRAY [, MASK], [,KIND])} @end multitable @item @emph{Arguments}: @multitable @columnfractions .15 .70 -@item @var{ARRAY} @tab Shall be an array of type @code{INTEGER} or -@code{REAL}. +@item @var{ARRAY} @tab Shall be an array of type @code{INTEGER}, +@code{REAL} or @code{CHARACTER}. @item @var{DIM} @tab (Optional) Shall be a scalar of type @code{INTEGER}, with a value between one and the rank of @var{ARRAY}, inclusive. It may not be an optional dummy argument. @item @var{MASK} @tab Shall be an array of type @code{LOGICAL}, and conformable with @var{ARRAY}. +@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization +expression indicating the kind parameter of the result. @end multitable @item @emph{Return value}: