From a6fcd41adad8ad955a26694e20e50bcfa4b7e72e Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Tue, 17 Jul 2012 10:59:18 +0200 Subject: [PATCH] re PR fortran/49265 (Double colon in procedure-stmt (generic interface)) 2012-07-17 Tobias Burnus Steven G. Kargl PR fortran/49265 * decl.c (match_procedure_in_interface): Support "::" for Fortran 2008 and later. 2012-07-17 Tobias Burnus PR fortran/49265 * gfortran.dg/module_procedure_double_colon_3.f90: New. * gfortran.dg/module_procedure_double_colon_4.f90: New. Co-Authored-By: Steven G. Kargl From-SVN: r189562 --- gcc/fortran/ChangeLog | 7 +++++++ gcc/fortran/decl.c | 14 ++++++++++++++ gcc/testsuite/ChangeLog | 6 ++++++ .../module_procedure_double_colon_3.f90 | 16 ++++++++++++++++ .../module_procedure_double_colon_4.f90 | 16 ++++++++++++++++ 5 files changed, 59 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/module_procedure_double_colon_3.f90 create mode 100644 gcc/testsuite/gfortran.dg/module_procedure_double_colon_4.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index c080e5afd93..fede706c0c6 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2012-07-17 Tobias Burnus + Steven G. Kargl + + PR fortran/49265 + * decl.c (match_procedure_in_interface): Support "::" for + Fortran 2008 and later. + 2012-07-16 Thomas König PR fortran/53824 diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index c3644b6d8f8..9bd3dc3a688 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -5108,6 +5108,7 @@ match_procedure_in_interface (void) match m; gfc_symbol *sym; char name[GFC_MAX_SYMBOL_LEN + 1]; + locus old_locus; if (current_interface.type == INTERFACE_NAMELESS || current_interface.type == INTERFACE_ABSTRACT) @@ -5116,6 +5117,19 @@ match_procedure_in_interface (void) return MATCH_ERROR; } + /* Check if the F2008 optional double colon appears. */ + gfc_gobble_whitespace (); + old_locus = gfc_current_locus; + if (gfc_match ("::") == MATCH_YES) + { + if (gfc_notify_std (GFC_STD_F2008, "Fortran 2008: double colon in " + "MODULE PROCEDURE statement at %L", &old_locus) + == FAILURE) + return MATCH_ERROR; + } + else + gfc_current_locus = old_locus; + for(;;) { m = gfc_match_name (name); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f0a13ab3c67..b978c907e04 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2012-07-17 Tobias Burnus + + PR fortran/49265 + * gfortran.dg/module_procedure_double_colon_3.f90: New. + * gfortran.dg/module_procedure_double_colon_4.f90: New. + 2012-07-16 Jason Merrill * g++.dg/parse/access8.C: Adjust. diff --git a/gcc/testsuite/gfortran.dg/module_procedure_double_colon_3.f90 b/gcc/testsuite/gfortran.dg/module_procedure_double_colon_3.f90 new file mode 100644 index 00000000000..620f82ac1fa --- /dev/null +++ b/gcc/testsuite/gfortran.dg/module_procedure_double_colon_3.f90 @@ -0,0 +1,16 @@ +! { dg-do compile } +! { dg-options "-std=f2003" } +! +! PR fortran/49265 +! +! Contributed by Erik Toussaint +! +module m1 + implicit none + interface foo + procedure :: bar ! { dg-error "Fortran 2008: double colon in MODULE PROCEDURE statement" } + end interface +contains + subroutine bar + end subroutine +end module diff --git a/gcc/testsuite/gfortran.dg/module_procedure_double_colon_4.f90 b/gcc/testsuite/gfortran.dg/module_procedure_double_colon_4.f90 new file mode 100644 index 00000000000..d56823c1f6a --- /dev/null +++ b/gcc/testsuite/gfortran.dg/module_procedure_double_colon_4.f90 @@ -0,0 +1,16 @@ +! { dg-do compile } +! { dg-options "-std=f2008" } +! +! PR fortran/49265 +! +! Contributed by Erik Toussaint +! +module m1 + implicit none + interface foo + procedure :: bar ! "::" is valid since Fortran 2008 + end interface +contains + subroutine bar + end subroutine +end module -- 2.30.2