Hi Thomas, On 09.02.21 22:54, Thomas Koenig via Fortran wrote:
Just one nit: MASK does not have to be an array, it can also be a scalar. It just has to be conformable.
Well spotted. However, that also applies to {MAX,MIN}{LOC,VAL}. Hence, I updated those as well.
I will commit the patch tomorrow. Thanks, Tobias
Fortran: intrinsic.texi add missing arg to FINDLOC gcc/fortran/ChangeLog: * intrinsic.texi (FINDLOC): Add 'MASK' to argument table. (MAXLOC, MAXVAL, MINLOC, MINVAL): For 'MASK', remove 'an array' as scalars are also permitted. diff --git a/gcc/fortran/intrinsic.texi b/gcc/fortran/intrinsic.texi index 63416bce7fd..ea78f7d343a 100644 --- a/gcc/fortran/intrinsic.texi +++ b/gcc/fortran/intrinsic.texi @@ -6188,6 +6188,8 @@ conformance with @var{ARRAY}. @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 (Optional) Shall be 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. @item @var{BACK} @tab (Optional) A scalar of type @code{LOGICAL}. @@ -10356,7 +10358,7 @@ Transformational function @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}, +@item @var{MASK} @tab Shall be 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. @@ -10417,7 +10419,7 @@ Transformational function @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 (Optional) Shall be an array of type @code{LOGICAL}, +@item @var{MASK} @tab (Optional) Shall be of type @code{LOGICAL}, and conformable with @var{ARRAY}. @end multitable @@ -10723,7 +10725,7 @@ Transformational function @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}, +@item @var{MASK} @tab Shall be 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. @@ -10784,7 +10786,7 @@ Transformational function @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}, +@item @var{MASK} @tab Shall be of type @code{LOGICAL}, and conformable with @var{ARRAY}. @end multitable