Commit 243501b7 by Thomas Koenig

intrinsic.texi (MAXLOC): Update documentation for character arrays and KIND argument.

2017-12-11  Thomas Koenig  <tkoenig@gcc.gnu.org>

	* intrinsic.texi (MAXLOC): Update documentation for
	character arrays and KIND argument.
	(MINLOC): Likewise.

From-SVN: r255546
parent ee61f880
2017-12-11 Thomas Koenig <tkoenig@gcc.gnu.org> 2017-12-11 Thomas Koenig <tkoenig@gcc.gnu.org>
* intrinsic.texi (MAXLOC): Update documentation for
character arrays and KIND argument.
(MINLOC): Likewise.
2017-12-11 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/45689 PR fortran/45689
* simplify.c (min_max_choose): Add prototype. * simplify.c (min_max_choose): Add prototype.
(gfc_count): Format correctly. (gfc_count): Format correctly.
......
...@@ -9994,18 +9994,21 @@ that of the first such element in array element order. If the array has ...@@ -9994,18 +9994,21 @@ that of the first such element in array element order. If the array has
zero size, or all of the elements of @var{MASK} are @code{.FALSE.}, then 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 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 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}: @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}: @item @emph{Class}:
Transformational function Transformational function
@item @emph{Syntax}: @item @emph{Syntax}:
@multitable @columnfractions .80 @multitable @columnfractions .80
@item @code{RESULT = MAXLOC(ARRAY, DIM [, MASK])} @item @code{RESULT = MAXLOC(ARRAY, DIM [, MASK] [,KIND])}
@item @code{RESULT = MAXLOC(ARRAY [, MASK])} @item @code{RESULT = MAXLOC(ARRAY [, MASK] [,KIND])}
@end multitable @end multitable
@item @emph{Arguments}: @item @emph{Arguments}:
...@@ -10017,6 +10020,8 @@ Transformational function ...@@ -10017,6 +10020,8 @@ Transformational function
inclusive. It may not be an optional dummy argument. 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 an array of type @code{LOGICAL},
and conformable with @var{ARRAY}. and conformable with @var{ARRAY}.
@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization
expression indicating the kind parameter of the result.
@end multitable @end multitable
@item @emph{Return value}: @item @emph{Return value}:
...@@ -10342,29 +10347,34 @@ that of the first such element in array element order. If the array has ...@@ -10342,29 +10347,34 @@ that of the first such element in array element order. If the array has
zero size, or all of the elements of @var{MASK} are @code{.FALSE.}, then 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 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 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}: @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}: @item @emph{Class}:
Transformational function Transformational function
@item @emph{Syntax}: @item @emph{Syntax}:
@multitable @columnfractions .80 @multitable @columnfractions .80
@item @code{RESULT = MINLOC(ARRAY, DIM [, MASK])} @item @code{RESULT = MINLOC(ARRAY, DIM [, MASK] [,KIND])}
@item @code{RESULT = MINLOC(ARRAY [, MASK])} @item @code{RESULT = MINLOC(ARRAY [, MASK], [,KIND])}
@end multitable @end multitable
@item @emph{Arguments}: @item @emph{Arguments}:
@multitable @columnfractions .15 .70 @multitable @columnfractions .15 .70
@item @var{ARRAY} @tab Shall be an array of type @code{INTEGER} or @item @var{ARRAY} @tab Shall be an array of type @code{INTEGER},
@code{REAL}. @code{REAL} or @code{CHARACTER}.
@item @var{DIM} @tab (Optional) Shall be a scalar of type @item @var{DIM} @tab (Optional) Shall be a scalar of type
@code{INTEGER}, with a value between one and the rank of @var{ARRAY}, @code{INTEGER}, with a value between one and the rank of @var{ARRAY},
inclusive. It may not be an optional dummy argument. 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 an array of type @code{LOGICAL},
and conformable with @var{ARRAY}. and conformable with @var{ARRAY}.
@item @var{KIND} @tab (Optional) An @code{INTEGER} initialization
expression indicating the kind parameter of the result.
@end multitable @end multitable
@item @emph{Return value}: @item @emph{Return value}:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment