diff options
| author | Tobias Burnus <burnus@net-b.de> | 2008-01-13 22:29:49 +0100 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2008-01-13 22:29:49 +0100 |
| commit | 083de129c8dd26ae3dcd5f24c77a3f424763e69f (patch) | |
| tree | dee17b4bb562c6f86a2a0f98c471c03ba7f79193 /gcc | |
| parent | 86288ff05fb23823f76c64f2c1f310283c74f822 (diff) | |
| download | gcc-083de129c8dd26ae3dcd5f24c77a3f424763e69f.zip gcc-083de129c8dd26ae3dcd5f24c77a3f424763e69f.tar.gz gcc-083de129c8dd26ae3dcd5f24c77a3f424763e69f.tar.bz2 | |
re PR fortran/34763 (bare END not allowed in an interface block in a module procedure)
2008-01-13 Tobias Burnus <burnus@net-b.de>
PR fortran/34763
* decl.c (contained_procedure): Only check directly preceeding
* state.
2008-01-13 Tobias Burnus <burnus@net-b.de>
PR fortran/34763
* gfortran.dg/interface_proc_end.f90: New.
From-SVN: r131512
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 9 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/interface_proc_end.f90 | 19 |
4 files changed, 33 insertions, 5 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 5f94e76..683d66b 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,10 @@ 2008-01-13 Tobias Burnus <burnus@net-b.de> + PR fortran/34763 + * decl.c (contained_procedure): Only check directly preceeding state. + +2008-01-13 Tobias Burnus <burnus@net-b.de> + PR fortran/34759 * check.c (gfc_check_shape): Accept array ranges of assumed-size arrays. diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index dd8eb35..74d0962 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -4870,12 +4870,11 @@ gfc_match_bind_c (gfc_symbol *sym, bool allow_binding_name) static int contained_procedure (void) { - gfc_state_data *s; + gfc_state_data *s = gfc_state_stack; - for (s=gfc_state_stack; s; s=s->previous) - if ((s->state == COMP_SUBROUTINE || s->state == COMP_FUNCTION) - && s->previous != NULL && s->previous->state == COMP_CONTAINS) - return 1; + if ((s->state == COMP_SUBROUTINE || s->state == COMP_FUNCTION) + && s->previous != NULL && s->previous->state == COMP_CONTAINS) + return 1; return 0; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 98557e6..09b233e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2008-01-13 Tobias Burnus <burnus@net-b.de> + PR fortran/34763 + * gfortran.dg/interface_proc_end.f90: New. + +2008-01-13 Tobias Burnus <burnus@net-b.de> + PR fortran/34759 * gfortran.dg/assumed_size_refs_4.f90: New. diff --git a/gcc/testsuite/gfortran.dg/interface_proc_end.f90 b/gcc/testsuite/gfortran.dg/interface_proc_end.f90 new file mode 100644 index 0000000..d037de6 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/interface_proc_end.f90 @@ -0,0 +1,19 @@ +! { dg-do compile} +! +! PR fortran/34763 +! Before, gfortran did not allow for the "END" in +! the interface, which is no module procedure. +! +! Test case contributed by Dick Hendrickson +! + module n + contains + subroutine n_interface + INTERFACE + SUBROUTINE NGSXDY(TLS1,TLS2) + REAL :: TLS1,TLS2 + END ! OK + END INTERFACE + end ! { dg-error "END SUBROUTINE statement" } + end module ! { dg-error "END SUBROUTINE statement" } +! { dg-excess-errors "Unexpected end of file" } |