From 9a0fb43ea1f6aabf4668d4ad3faf76c2da4d8647 Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Sat, 25 Mar 2006 21:15:48 +0000 Subject: re PR fortran/26769 (Implement transpose() and reshape() for real instead of using integer) 2006-03-25 Thomas Koenig PR fortran/26769 * iresolve.c (gfc_resolve_reshape): Remove doubling of kind for complex. For real(kind=10), call reshape_r10. (gfc_resolve_transpose): For real(kind=10), call transpose_r10. 2006-03-25 Thomas Koenig PR fortran/26769 * Makefile.am: Add transpose_r10.c and reshape_r10.c. * aclocal.m4: Regenerate using aclocal 1.9.3. * Makefile.in: Regenerate using automake 1.9.3. * m4/iparm.m4 (rtype_ccode): If rtype_letter is `i', evaluate to rtype_kind, otherwise to rtype_code. * generated/transpose_r10.c: Add. * generated/reshape_r10.c: Add. 2006-03-25 Thomas Koenig PR fortran/26769 * gfortran.dg/transpose_reshape_r10.f90: New test case. From-SVN: r112381 --- gcc/fortran/iresolve.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'gcc/fortran/iresolve.c') diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c index df562f7..a517994 100644 --- a/gcc/fortran/iresolve.c +++ b/gcc/fortran/iresolve.c @@ -1499,9 +1499,6 @@ gfc_resolve_reshape (gfc_expr * f, gfc_expr * source, gfc_expr * shape, switch (source->ts.type) { case BT_COMPLEX: - kind = source->ts.kind * 2; - break; - case BT_REAL: case BT_INTEGER: case BT_LOGICAL: @@ -1523,6 +1520,10 @@ gfc_resolve_reshape (gfc_expr * f, gfc_expr * source, gfc_expr * shape, f->value.function.name = gfc_get_string (PREFIX("reshape_%c%d"), gfc_type_letter (BT_COMPLEX), source->ts.kind); + else if (source->ts.type == BT_REAL && kind == 10) + f->value.function.name = + gfc_get_string (PREFIX("reshape_%c%d"), + gfc_type_letter (BT_REAL), source->ts.kind); else f->value.function.name = gfc_get_string (PREFIX("reshape_%d"), source->ts.kind); @@ -1987,8 +1988,19 @@ gfc_resolve_transpose (gfc_expr * f, gfc_expr * matrix) gfc_get_string (PREFIX("transpose_c%d"), kind); break; - case BT_INTEGER: case BT_REAL: + /* There is no kind=10 integer type. We need to + call the real version. */ + if (kind == 10) + { + f->value.function.name = + gfc_get_string (PREFIX("transpose_r%d"), kind); + break; + } + + /* Fall through */ + + case BT_INTEGER: case BT_LOGICAL: /* Use the integer routines for real and logical cases. This assumes they all have the same alignment requirements. */ -- cgit v1.1