From 5f9bfaf2bcc4f12f5ee6ac33c2bab1a752db1f4d Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Sun, 17 Apr 2005 20:26:57 +0000 Subject: 005-04-17 Thomas Koenig PR libfortran/21075 * m4/reshape.m4 (reshape_`'rtype_kind): Change dimension of auxiliary arrays from GFC_MAX_DIMENSIONS - 1 to GFC_MAX_DIMENSIONS. * intrinsics/reshape_generic.c (reshape_generic): Likewise. * generated/reshape_i4.c: Regenerated. * generated/reshape_i8.c: Regenerated. 2005-04-17 Thomas Koenig PR libfortran/21075 * gfortran.dg/reshape_rank7.f90: New test. From-SVN: r98288 --- libgfortran/ChangeLog | 10 ++++++++++ libgfortran/generated/reshape_i4.c | 18 +++++++++--------- libgfortran/generated/reshape_i8.c | 18 +++++++++--------- libgfortran/intrinsics/reshape_generic.c | 18 +++++++++--------- libgfortran/m4/reshape.m4 | 18 +++++++++--------- 5 files changed, 46 insertions(+), 36 deletions(-) (limited to 'libgfortran') diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 9c083ad..045f8ce 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,13 @@ +2005-04-17 Thomas Koenig + + PR libfortran/21075 + * m4/reshape.m4 (reshape_`'rtype_kind): Change dimension + of auxiliary arrays from GFC_MAX_DIMENSIONS - 1 to + GFC_MAX_DIMENSIONS. + * intrinsics/reshape_generic.c (reshape_generic): Likewise. + * generated/reshape_i4.c: Regenerated. + * generated/reshape_i8.c: Regenerated. + 2005-04-17 Paul Thomas * io/list_read.c (eat_separator): at_eol = 1 replaced(zapped at some time?). diff --git a/libgfortran/generated/reshape_i4.c b/libgfortran/generated/reshape_i4.c index 454613f..fbe16f2 100644 --- a/libgfortran/generated/reshape_i4.c +++ b/libgfortran/generated/reshape_i4.c @@ -47,25 +47,25 @@ reshape_4 (gfc_array_i4 * ret, gfc_array_i4 * source, shape_type * shape, gfc_array_i4 * pad, shape_type * order) { /* r.* indicates the return array. */ - index_type rcount[GFC_MAX_DIMENSIONS - 1]; - index_type rextent[GFC_MAX_DIMENSIONS - 1]; - index_type rstride[GFC_MAX_DIMENSIONS - 1]; + index_type rcount[GFC_MAX_DIMENSIONS]; + index_type rextent[GFC_MAX_DIMENSIONS]; + index_type rstride[GFC_MAX_DIMENSIONS]; index_type rstride0; index_type rdim; index_type rsize; GFC_INTEGER_4 *rptr; /* s.* indicates the source array. */ - index_type scount[GFC_MAX_DIMENSIONS - 1]; - index_type sextent[GFC_MAX_DIMENSIONS - 1]; - index_type sstride[GFC_MAX_DIMENSIONS - 1]; + index_type scount[GFC_MAX_DIMENSIONS]; + index_type sextent[GFC_MAX_DIMENSIONS]; + index_type sstride[GFC_MAX_DIMENSIONS]; index_type sstride0; index_type sdim; index_type ssize; const GFC_INTEGER_4 *sptr; /* p.* indicates the pad array. */ - index_type pcount[GFC_MAX_DIMENSIONS - 1]; - index_type pextent[GFC_MAX_DIMENSIONS - 1]; - index_type pstride[GFC_MAX_DIMENSIONS - 1]; + index_type pcount[GFC_MAX_DIMENSIONS]; + index_type pextent[GFC_MAX_DIMENSIONS]; + index_type pstride[GFC_MAX_DIMENSIONS]; index_type pdim; index_type psize; const GFC_INTEGER_4 *pptr; diff --git a/libgfortran/generated/reshape_i8.c b/libgfortran/generated/reshape_i8.c index f58e9b2..6d835ff 100644 --- a/libgfortran/generated/reshape_i8.c +++ b/libgfortran/generated/reshape_i8.c @@ -47,25 +47,25 @@ reshape_8 (gfc_array_i8 * ret, gfc_array_i8 * source, shape_type * shape, gfc_array_i8 * pad, shape_type * order) { /* r.* indicates the return array. */ - index_type rcount[GFC_MAX_DIMENSIONS - 1]; - index_type rextent[GFC_MAX_DIMENSIONS - 1]; - index_type rstride[GFC_MAX_DIMENSIONS - 1]; + index_type rcount[GFC_MAX_DIMENSIONS]; + index_type rextent[GFC_MAX_DIMENSIONS]; + index_type rstride[GFC_MAX_DIMENSIONS]; index_type rstride0; index_type rdim; index_type rsize; GFC_INTEGER_8 *rptr; /* s.* indicates the source array. */ - index_type scount[GFC_MAX_DIMENSIONS - 1]; - index_type sextent[GFC_MAX_DIMENSIONS - 1]; - index_type sstride[GFC_MAX_DIMENSIONS - 1]; + index_type scount[GFC_MAX_DIMENSIONS]; + index_type sextent[GFC_MAX_DIMENSIONS]; + index_type sstride[GFC_MAX_DIMENSIONS]; index_type sstride0; index_type sdim; index_type ssize; const GFC_INTEGER_8 *sptr; /* p.* indicates the pad array. */ - index_type pcount[GFC_MAX_DIMENSIONS - 1]; - index_type pextent[GFC_MAX_DIMENSIONS - 1]; - index_type pstride[GFC_MAX_DIMENSIONS - 1]; + index_type pcount[GFC_MAX_DIMENSIONS]; + index_type pextent[GFC_MAX_DIMENSIONS]; + index_type pstride[GFC_MAX_DIMENSIONS]; index_type pdim; index_type psize; const GFC_INTEGER_8 *pptr; diff --git a/libgfortran/intrinsics/reshape_generic.c b/libgfortran/intrinsics/reshape_generic.c index 80a31af..c0339ca 100644 --- a/libgfortran/intrinsics/reshape_generic.c +++ b/libgfortran/intrinsics/reshape_generic.c @@ -48,25 +48,25 @@ reshape (parray *ret, parray *source, shape_type *shape, parray *pad, shape_type *order) { /* r.* indicates the return array. */ - index_type rcount[GFC_MAX_DIMENSIONS - 1]; - index_type rextent[GFC_MAX_DIMENSIONS - 1]; - index_type rstride[GFC_MAX_DIMENSIONS - 1]; + index_type rcount[GFC_MAX_DIMENSIONS]; + index_type rextent[GFC_MAX_DIMENSIONS]; + index_type rstride[GFC_MAX_DIMENSIONS]; index_type rstride0; index_type rdim; index_type rsize; char *rptr; /* s.* indicates the source array. */ - index_type scount[GFC_MAX_DIMENSIONS - 1]; - index_type sextent[GFC_MAX_DIMENSIONS - 1]; - index_type sstride[GFC_MAX_DIMENSIONS - 1]; + index_type scount[GFC_MAX_DIMENSIONS]; + index_type sextent[GFC_MAX_DIMENSIONS]; + index_type sstride[GFC_MAX_DIMENSIONS]; index_type sstride0; index_type sdim; index_type ssize; const char *sptr; /* p.* indicates the pad array. */ - index_type pcount[GFC_MAX_DIMENSIONS - 1]; - index_type pextent[GFC_MAX_DIMENSIONS - 1]; - index_type pstride[GFC_MAX_DIMENSIONS - 1]; + index_type pcount[GFC_MAX_DIMENSIONS]; + index_type pextent[GFC_MAX_DIMENSIONS]; + index_type pstride[GFC_MAX_DIMENSIONS]; index_type pdim; index_type psize; const char *pptr; diff --git a/libgfortran/m4/reshape.m4 b/libgfortran/m4/reshape.m4 index 90a23e3..22e2536 100644 --- a/libgfortran/m4/reshape.m4 +++ b/libgfortran/m4/reshape.m4 @@ -49,25 +49,25 @@ reshape_`'rtype_kind (rtype * ret, rtype * source, shape_type * shape, rtype * pad, shape_type * order) { /* r.* indicates the return array. */ - index_type rcount[GFC_MAX_DIMENSIONS - 1]; - index_type rextent[GFC_MAX_DIMENSIONS - 1]; - index_type rstride[GFC_MAX_DIMENSIONS - 1]; + index_type rcount[GFC_MAX_DIMENSIONS]; + index_type rextent[GFC_MAX_DIMENSIONS]; + index_type rstride[GFC_MAX_DIMENSIONS]; index_type rstride0; index_type rdim; index_type rsize; rtype_name *rptr; /* s.* indicates the source array. */ - index_type scount[GFC_MAX_DIMENSIONS - 1]; - index_type sextent[GFC_MAX_DIMENSIONS - 1]; - index_type sstride[GFC_MAX_DIMENSIONS - 1]; + index_type scount[GFC_MAX_DIMENSIONS]; + index_type sextent[GFC_MAX_DIMENSIONS]; + index_type sstride[GFC_MAX_DIMENSIONS]; index_type sstride0; index_type sdim; index_type ssize; const rtype_name *sptr; /* p.* indicates the pad array. */ - index_type pcount[GFC_MAX_DIMENSIONS - 1]; - index_type pextent[GFC_MAX_DIMENSIONS - 1]; - index_type pstride[GFC_MAX_DIMENSIONS - 1]; + index_type pcount[GFC_MAX_DIMENSIONS]; + index_type pextent[GFC_MAX_DIMENSIONS]; + index_type pstride[GFC_MAX_DIMENSIONS]; index_type pdim; index_type psize; const rtype_name *pptr; -- cgit v1.1