From d663434b6cd9ae8cbaac50a8c1dcff317594184d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tobias=20Schl=C3=BCter?= Date: Sat, 15 May 2004 20:02:20 +0200 Subject: [PATCH] re PR fortran/13826 (Derived types in DATA statements not PARAMETERs) fortran: PR fortran/13826 * primary.c (match_structure_constructor): Rename ... (gfc_match_structure_constructor): ... to this. Make non-static. (gfc_match_rvalue): Call renamed function. * match.h (gfc_match_structure_constructor): Declare. * match.c (gfc_match_data_constant): Handle structure constructor. testsuite: PR fortran/13826 * gfortran.fortran-torture/compile/data_1.f90: New test. From-SVN: r81891 --- gcc/fortran/ChangeLog | 11 ++++++++++- gcc/fortran/match.c | 5 ++++- gcc/fortran/match.h | 1 + gcc/fortran/primary.c | 6 +++--- gcc/testsuite/ChangeLog | 5 +++++ .../gfortran.fortran-torture/compile/data_1.f90 | 7 +++++++ 6 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/gfortran.fortran-torture/compile/data_1.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index a1542b5db3e..16ea4470998 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,13 @@ +2004-05-15 Tobias Schlueter + + PR fortran/13826 + * primary.c (match_structure_constructor): Rename ... + (gfc_match_structure_constructor): ... to this. Make non-static. + (gfc_match_rvalue): Call renamed function. + * match.h (gfc_match_structure_constructor): Declare. + * match.c (gfc_match_data_constant): Handle structure + constructor. + 2004-05-15 Tobias Schlueter PR fortran/13702 @@ -47,7 +57,6 @@ preprocessor flags. (all): Add missing initializers. - 2004-05-15 Tobias Schlueter * Make-lang.in (trans-common.o): Remove redundant dependency. diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c index dc8dc3e7333..1b2b763013e 100644 --- a/gcc/fortran/match.c +++ b/gcc/fortran/match.c @@ -2907,12 +2907,15 @@ match_data_constant (gfc_expr ** result) if (gfc_find_symbol (name, NULL, 1, &sym)) return MATCH_ERROR; - if (sym == NULL || sym->attr.flavor != FL_PARAMETER) + if (sym == NULL + || (sym->attr.flavor != FL_PARAMETER && sym->attr.flavor != FL_DERIVED)) { gfc_error ("Symbol '%s' must be a PARAMETER in DATA statement at %C", name); return MATCH_ERROR; } + else if (sym->attr.flavor == FL_DERIVED) + return gfc_match_structure_constructor (sym, result); *result = gfc_copy_expr (sym->value); return MATCH_YES; diff --git a/gcc/fortran/match.h b/gcc/fortran/match.h index 25e551caa6c..6cff5cc0aa0 100644 --- a/gcc/fortran/match.h +++ b/gcc/fortran/match.h @@ -120,6 +120,7 @@ match gfc_match_modproc (void); match gfc_match_target (void); /* primary.c */ +match gfc_match_structure_constructor (gfc_symbol *, gfc_expr **); match gfc_match_rvalue (gfc_expr **); match gfc_match_variable (gfc_expr **, int); match gfc_match_actual_arglist (int, gfc_actual_arglist **); diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c index 03e975776ea..d10a46244e9 100644 --- a/gcc/fortran/primary.c +++ b/gcc/fortran/primary.c @@ -1747,8 +1747,8 @@ gfc_expr_attr (gfc_expr * e) /* Match a structure constructor. The initial symbol has already been seen. */ -static match -match_structure_constructor (gfc_symbol * sym, gfc_expr ** result) +match +gfc_match_structure_constructor (gfc_symbol * sym, gfc_expr ** result) { gfc_constructor *head, *tail; gfc_component *comp; @@ -1908,7 +1908,7 @@ gfc_match_rvalue (gfc_expr ** result) if (sym == NULL) m = MATCH_ERROR; else - m = match_structure_constructor (sym, &e); + m = gfc_match_structure_constructor (sym, &e); break; /* If we're here, then the name is known to be the name of a diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0f1ec72238c..d23aed287c8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2004-05-15 Tobias Schlueter + + PR fortran/13826 + * gfortran.fortran-torture/compile/data_1.f90: New test. + 2004-05-15 Ulrich Weigand * gcc.dg/const-elim-1.c: Remove XFAIL for s390*-*-*. diff --git a/gcc/testsuite/gfortran.fortran-torture/compile/data_1.f90 b/gcc/testsuite/gfortran.fortran-torture/compile/data_1.f90 new file mode 100644 index 00000000000..fa8ab9fe1f7 --- /dev/null +++ b/gcc/testsuite/gfortran.fortran-torture/compile/data_1.f90 @@ -0,0 +1,7 @@ +! this tests the fix for PR 13826 +TYPE a + REAL x +END TYPE +TYPE(a) :: y +DATA y /a(1.)/ ! used to give an error about non-PARAMETER +END -- 2.30.2