Patchwork PR fortran/49265 -- allow for double colon in module procedure statement

login
register
mail settings
Submitter Steve Kargl
Date June 2, 2011, 4:20 p.m.
Message ID <20110602162036.GA18169@troutmask.apl.washington.edu>
Download mbox | patch
Permalink /patch/98443/
State New
Headers show

Comments

Steve Kargl - June 2, 2011, 4:20 p.m.
On Thu, Jun 02, 2011 at 05:59:29PM +0200, Thomas Koenig wrote:
> Hi Steve,
> 
> it seems that, with your patch,
> 
>    interface foo
>       module procedure::bar
>    end interface
> 
> is rejected, as is
> 
>   interface foo
>      module procuedure:: bar
>   end interface
> 
> Is this the way it is supposed to be?
> 

Oh phew.  Good catch.  I wasn't dealing with
the possible white space issues.  Here's an
updated patch and testcase.
Thomas Koenig - June 2, 2011, 4:39 p.m.
Hi Steve,


> Oh phew.  Good catch.  I wasn't dealing with
> the possible white space issues.  Here's an
> updated patch and testcase.
>

OK for trunk.  Could you also add the test case a second time,
without -std=f95, to make sure it keeps passing?

Thanks for the patch!

	Thomas
Steve Kargl - June 2, 2011, 5:02 p.m.
On Thu, Jun 02, 2011 at 06:39:18PM +0200, Thomas Koenig wrote:
> Hi Steve,
> 
> 
> >Oh phew.  Good catch.  I wasn't dealing with
> >the possible white space issues.  Here's an
> >updated patch and testcase.
> >
> 
> OK for trunk.  Could you also add the test case a second time,
> without -std=f95, to make sure it keeps passing?
> 

Yes, I'll add a 2nd testcase.  Thanks for the review.
Steve Kargl - June 2, 2011, 5:39 p.m.
On Thu, Jun 02, 2011 at 06:39:18PM +0200, Thomas Koenig wrote:
> Hi Steve,
> 
> 
> >Oh phew.  Good catch.  I wasn't dealing with
> >the possible white space issues.  Here's an
> >updated patch and testcase.
> >
> 
> OK for trunk.  Could you also add the test case a second time,
> without -std=f95, to make sure it keeps passing?
> 
> Thanks for the patch!
> 

svn-commit.tmp: 14 lines, 440 characters.
Sending        fortran/ChangeLog
Sending        fortran/decl.c
Sending        fortran/parse.c
Sending        testsuite/ChangeLog
Adding         testsuite/gfortran.dg/module_procedure_double_colon_1.f90
Adding         testsuite/gfortran.dg/module_procedure_double_colon_2.f90
Transmitting file data ......
Committed revision 174569.

Patch

Index: gcc/fortran/ChangeLog
===================================================================
--- gcc/fortran/ChangeLog	(revision 174566)
+++ gcc/fortran/ChangeLog	(working copy)
@@ -1,3 +1,11 @@ 
+2011-06-02  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/49265
+	* decl.c (gfc_match_modproc):  Allow for a double colon in a module
+	procedure statement.
+	* parse.c ( decode_statement): Deal with whitespace around :: in
+	gfc_match_modproc.
+ 
 2011-05-31  Tobias Burnus  <burnus@net-b.de>
 
 	PR fortran/18918
Index: gcc/fortran/decl.c
===================================================================
--- gcc/fortran/decl.c	(revision 174566)
+++ gcc/fortran/decl.c	(working copy)
@@ -7016,6 +7016,7 @@  gfc_match_modproc (void)
   char name[GFC_MAX_SYMBOL_LEN + 1];
   gfc_symbol *sym;
   match m;
+  locus old_locus;
   gfc_namespace *module_ns;
   gfc_interface *old_interface_head, *interface;
 
@@ -7044,10 +7045,23 @@  gfc_match_modproc (void)
      end up with a syntax error and need to recover.  */
   old_interface_head = gfc_current_interface_head ();
 
+  /* 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 (;;)
     {
-      locus old_locus = gfc_current_locus;
       bool last = false;
+      old_locus = gfc_current_locus;
 
       m = gfc_match_name (name);
       if (m == MATCH_NO)
@@ -7059,6 +7073,7 @@  gfc_match_modproc (void)
 	 current namespace.  */
       if (gfc_match_eos () == MATCH_YES)
 	last = true;
+
       if (!last && gfc_match_char (',') != MATCH_YES)
 	goto syntax;
 
Index: gcc/fortran/parse.c
===================================================================
--- gcc/fortran/parse.c	(revision 174566)
+++ gcc/fortran/parse.c	(working copy)
@@ -399,7 +399,7 @@  decode_statement (void)
       break;
 
     case 'm':
-      match ("module% procedure% ", gfc_match_modproc, ST_MODULE_PROC);
+      match ("module% procedure", gfc_match_modproc, ST_MODULE_PROC);
       match ("module", gfc_match_module, ST_MODULE);
       break;
 
Index: gcc/testsuite/ChangeLog
===================================================================
--- gcc/testsuite/ChangeLog	(revision 174566)
+++ gcc/testsuite/ChangeLog	(working copy)
@@ -1,3 +1,8 @@ 
+2011-06-02  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/49265
+	* gfortran.dg/module_procedure_double_colon.f90:  New test.
+
 2011-06-02  Eric Botcazou  <ebotcazou@adacore.com>
 	    Hans-Peter Nilsson  <hp@axis.com>
 
Index: gcc/testsuite/gfortran.dg/module_procedure_double_colon.f90
===================================================================
--- gcc/testsuite/gfortran.dg/module_procedure_double_colon.f90	(revision 0)
+++ gcc/testsuite/gfortran.dg/module_procedure_double_colon.f90	(revision 0)
@@ -0,0 +1,24 @@ 
+! { dg-do compile }
+! { dg-options "-std=f95" }
+!
+! PR fortran/49265
+! Contributed by Erik Toussaint
+!
+module m1
+   implicit none
+   interface foo
+      module procedure::bar       ! { dg-error "double colon" }
+      module procedure ::bar_none ! { dg-error "double colon" }
+      module procedure:: none_bar ! { dg-error "double colon" }
+   end interface
+contains
+   subroutine bar
+   end subroutine
+   subroutine bar_none(i)
+     integer i
+   end subroutine
+   subroutine none_bar(x)
+     real x
+   end subroutine
+end module
+! { dg-final { cleanup-modules "m1" } }