diff options
| author | Daniel Franke <franke.daniel@gmail.com> | 2008-01-22 07:19:54 -0500 |
|---|---|---|
| committer | Daniel Franke <dfranke@gcc.gnu.org> | 2008-01-22 07:19:54 -0500 |
| commit | c29164019f085d149e86412dfbbe0adeb79eeaba (patch) | |
| tree | 4ccd11ff53ce8a7677ff63920917386f216d8026 /gcc | |
| parent | 0387c1429da4a44bfe71b587cce23bb76d283ab8 (diff) | |
| download | gcc-c29164019f085d149e86412dfbbe0adeb79eeaba.zip gcc-c29164019f085d149e86412dfbbe0adeb79eeaba.tar.gz gcc-c29164019f085d149e86412dfbbe0adeb79eeaba.tar.bz2 | |
re PR fortran/34915 (-std=f95 rejects len_trim() and index() in init expressions)
gcc/fortran:
2008-01-22 Daniel Franke <franke.daniel@gmail.com>
PR fortran/34915
* expr.c (check_elemental): Fix check for valid data types.
gcc/testsuite:
2008-01-22 Daniel Franke <franke.daniel@gmail.com>
PR fortran/34915
* gfortran.dg/initialization_18.f90: New test.
From-SVN: r131715
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/initialization_18.f90 | 10 |
4 files changed, 22 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 57c9142..72af9f03 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2008-01-22 Daniel Franke <franke.daniel@gmail.com> + + PR fortran/34915 + * expr.c (check_elemental): Fix check for valid data types. + 2008-01-22 Tobias Burnus <burnus@net-b.de> PR fortran/34899 diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index e8b6548..fb1886e 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -2109,7 +2109,8 @@ check_elemental (gfc_expr *e) || !e->value.function.isym->elemental) return MATCH_NO; - if ((e->ts.type != BT_INTEGER || e->ts.type != BT_CHARACTER) + if (e->ts.type != BT_INTEGER + && e->ts.type != BT_CHARACTER && gfc_notify_std (GFC_STD_F2003, "Extension: Evaluation of " "nonstandard initialization expression at %L", &e->where) == FAILURE) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7e4fd05..e8cc0c2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-01-22 Daniel Franke <franke.daniel@gmail.com> + + PR fortran/34915 + * gfortran.dg/initialization_18.f90: New test. + 2008-01-22 Tobias Burnus <burnus@net-b.de> PR fortran/34899 diff --git a/gcc/testsuite/gfortran.dg/initialization_18.f90 b/gcc/testsuite/gfortran.dg/initialization_18.f90 new file mode 100644 index 0000000..4e26e1b --- /dev/null +++ b/gcc/testsuite/gfortran.dg/initialization_18.f90 @@ -0,0 +1,10 @@ +! { dg-do compile } +! { dg-options "-std=f95 -Wall" } +! +! PR fortran/34915 +! Testcase contributed by Al Greynolds via comp.lang.fortran. +! + + character(*),dimension(3),parameter :: a=(/'a() ','b(,) ','c(,,)'/) + integer,dimension(3),parameter :: l=len_trim(a) +end |