2006-03-13 Paul Thomas <pault@gcc.gnu.org>

	PR fortran/25378
	* trans-intrinsic.c (gfc_conv_intrinsic_minmaxloc): Set the initial position to zero and
	modify the condition for updating it, to implement the F2003 requirement for all(mask)
	is false.

2006-03-13  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/25378
	* libgfortran/m4/minloc1.m4: Set the initial position to zero and modify the condition for
	updating it, to implement the F2003 requirement for all(mask).eq.false.
	* libgfortran/m4/maxloc1.m4: The same.
	* libgfortran/m4/iforeach.m4: The same.
	* libgfortran/m4/minloc0.m4: The same.
	* libgfortran/m4/maxloc0.m4: The same.
	* libgfortran/generated/maxloc0_16_i16.c: Regenerated, together with 41 others.
	* libgfortran/generated/minloc0_16_i16.c: Regenerated, together with 41 others.

2006-03-13  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/25378
	* gfortran.fortran-torture/execute/intrinsic_mmloc_3.f90: Expand test to include more
	permuatations of mask and index.
	* testsuite/gfortran.dg/scalar_mask_1.f90: Modify last test to respond to F2003 spec.
	that the position returned for an all false mask && condition is zero.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@112028 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 14 insertions, 14 deletions

diff --git a/libgfortran/m4/iforeach.m4 b/libgfortran/m4/iforeach.m4
index 8c5ebc9cdc3..cfe563952bb 100644
--- a/libgfortran/m4/iforeach.m4
+++ b/libgfortran/m4/iforeach.m4
@@ -71,7 +71,7 @@ name`'rtype_qual`_'atype_code (rtype * const restrict retarray,
 
   /* Initialize the return value.  */
   for (n = 0; n < rank; n++)
-    dest[n * dstride] = 1;
+    dest[n * dstride] = 0;
   {
 ')dnl
 define(START_FOREACH_BLOCK,
@@ -198,7 +198,7 @@ void
 
   /* Initialize the return value.  */
   for (n = 0; n < rank; n++)
-    dest[n * dstride] = 1;
+    dest[n * dstride] = 0;
   {
 ')dnl
 define(START_MASKED_FOREACH_BLOCK, `START_FOREACH_BLOCK')dnl
diff --git a/libgfortran/m4/maxloc0.m4 b/libgfortran/m4/maxloc0.m4
index 8708a781609..9feaa4b99b8 100644
--- a/libgfortran/m4/maxloc0.m4
+++ b/libgfortran/m4/maxloc0.m4
@@ -45,7 +45,7 @@ FOREACH_FUNCTION(
 
   maxval = atype_min;'
 ,
-`  if (*base > maxval)
+`  if (*base > maxval || !dest[0])
     {
       maxval = *base;
       for (n = 0; n < rank; n++)
@@ -57,7 +57,7 @@ MASKED_FOREACH_FUNCTION(
 
   maxval = atype_min;'
 ,
-`  if (*mbase && *base > maxval)
+`  if (*mbase && (*base > maxval || !dest[0]))
     {
       maxval = *base;
       for (n = 0; n < rank; n++)
diff --git a/libgfortran/m4/maxloc1.m4 b/libgfortran/m4/maxloc1.m4
index d1ea9dcc9b5..161368482f6 100644
--- a/libgfortran/m4/maxloc1.m4
+++ b/libgfortran/m4/maxloc1.m4
@@ -43,8 +43,8 @@ include(ifunction.m4)dnl
 ARRAY_FUNCTION(0,
 `  atype_name maxval;
   maxval = atype_min;
-  result = 1;',
-`  if (*src > maxval)
+  result = 0;',
+`  if (*src > maxval || !result)
     {
       maxval = *src;
       result = (rtype_name)n + 1;
@@ -53,8 +53,8 @@ ARRAY_FUNCTION(0,
 MASKED_ARRAY_FUNCTION(0,
 `  atype_name maxval;
   maxval = atype_min;
-  result = 1;',
-`  if (*msrc && *src > maxval)
+  result = 0;',
+`  if (*msrc && (*src > maxval || !result))
     {
       maxval = *src;
       result = (rtype_name)n + 1;
diff --git a/libgfortran/m4/minloc0.m4 b/libgfortran/m4/minloc0.m4
index 10fb3a9119d..1c2aa18cf08 100644
--- a/libgfortran/m4/minloc0.m4
+++ b/libgfortran/m4/minloc0.m4
@@ -45,7 +45,7 @@ FOREACH_FUNCTION(
 
   minval = atype_max;'
 ,
-`  if (*base < minval)
+`  if (*base < minval || !dest[0])
     {
       minval = *base;
       for (n = 0; n < rank; n++)
@@ -57,7 +57,7 @@ MASKED_FOREACH_FUNCTION(
 
   minval = atype_max;'
 ,
-`  if (*mbase && *base < minval)
+`  if (*mbase && (*base < minval || !dest[0]))
     {
       minval = *base;
       for (n = 0; n < rank; n++)
diff --git a/libgfortran/m4/minloc1.m4 b/libgfortran/m4/minloc1.m4
index a224b732592..0c116eb63be 100644
--- a/libgfortran/m4/minloc1.m4
+++ b/libgfortran/m4/minloc1.m4
@@ -43,8 +43,8 @@ include(ifunction.m4)dnl
 ARRAY_FUNCTION(0,
 `  atype_name minval;
   minval = atype_max;
-  result = 1;',
-`  if (*src < minval)
+  result = 0;',
+`  if (*src < minval || !result)
     {
       minval = *src;
       result = (rtype_name)n + 1;
@@ -53,8 +53,8 @@ ARRAY_FUNCTION(0,
 MASKED_ARRAY_FUNCTION(0,
 `  atype_name minval;
   minval = atype_max;
-  result = 1;',
-`  if (*msrc && *src < minval)
+  result = 0;',
+`  if (*msrc && (*src < minval || !result))
     {
       minval = *src;
       result = (rtype_name)n + 1;