re PR fortran/49265 (Double colon in procedure-stmt (generic interface))

2012-07-17  Tobias Burnus  <burnus@net-b.de>
            Steven G. Kargl  <kargl@gcc.gnu.org>

        PR fortran/49265
        * decl.c (match_procedure_in_interface): Support "::" for
        Fortran 2008 and later.

2012-07-17  Tobias Burnus  <burnus@net-b.de>

        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 <kargl@gcc.gnu.org>

From-SVN: r189562

gcc/fortran/ChangeLog

+2012-07-17  Tobias Burnus  <burnus@net-b.de>
+	    Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/49265
+	* decl.c (match_procedure_in_interface): Support "::" for
+	Fortran 2008 and later.
+
 2012-07-16  Thomas König  <tkoenig@gcc.gnu.org>
 
 	PR fortran/53824

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);

gcc/testsuite/ChangeLog

+2012-07-17  Tobias Burnus  <burnus@net-b.de>
+
+	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  <jason@redhat.com>
 
 	* g++.dg/parse/access8.C: Adjust.

gcc/testsuite/gfortran.dg/module_procedure_double_colon_3.f90

+! { 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

gcc/testsuite/gfortran.dg/module_procedure_double_colon_4.f90

+! { 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