From 2ef0f9c6ebaa083a936c6cfa6c90295a8c4b89b6 Mon Sep 17 00:00:00 2001 From: Daniel Franke Date: Sun, 6 Dec 2009 07:59:46 -0500 Subject: [PATCH] re PR fortran/40904 (Documentation: Description for COUNT is wrong) 2009-12-06 Daniel Franke PR fortran/40904 * intrinsics.texi: Fixed description of COUNT. From-SVN: r155022 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/intrinsic.texi | 16 +++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index cc7059746c7..f8d45a4d731 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2009-12-06 Daniel Franke + + PR fortran/40904 + * intrinsics.texi: Fixed description of COUNT. + 2009-12-01 Janne Blomqvist PR fortran/42131 diff --git a/gcc/fortran/intrinsic.texi b/gcc/fortran/intrinsic.texi index 615f0364e1c..753e6e14ab7 100644 --- a/gcc/fortran/intrinsic.texi +++ b/gcc/fortran/intrinsic.texi @@ -2738,11 +2738,11 @@ Inverse function: @ref{ACOSH} @table @asis @item @emph{Description}: -@code{COUNT(MASK [, DIM [, KIND]])} counts the number of @code{.TRUE.} -elements of @var{MASK} along the dimension of @var{DIM}. If @var{DIM} is -omitted it is taken to be @code{1}. @var{DIM} is a scalar of type -@code{INTEGER} in the range of @math{1 \leq DIM \leq n)} where @math{n} -is the rank of @var{MASK}. +Counts the number of @code{.TRUE.} elements in a logical @var{MASK}, +or, if the @var{DIM} argument is supplied, counts the number of +elements along each row of the array in the @var{DIM} direction. +If the array has zero size, or all of the elements of @var{MASK} are +@code{.FALSE.}, then the result is @code{0}. @item @emph{Standard}: Fortran 95 and later, with @var{KIND} argument Fortran 2003 and later @@ -2751,7 +2751,7 @@ Fortran 95 and later, with @var{KIND} argument Fortran 2003 and later Transformational function @item @emph{Syntax}: -@code{RESULT = COUNT(MASK [, DIM [, KIND]])} +@code{RESULT = COUNT(MASK [, DIM, KIND])} @item @emph{Arguments}: @multitable @columnfractions .15 .70 @@ -2764,7 +2764,9 @@ expression indicating the kind parameter of the result. @item @emph{Return value}: The return value is of type @code{INTEGER} and of kind @var{KIND}. If @var{KIND} is absent, the return value is of default integer kind. -The result has a rank equal to that of @var{MASK}. +If @var{DIM} is present, the result is an array with a rank one less +than the rank of @var{ARRAY}, and a size corresponding to the shape +of @var{ARRAY} with the @var{DIM} dimension removed. @item @emph{Example}: @smallexample -- 2.30.2