This is the mail archive of the
fortran@gcc.gnu.org
mailing list for the GNU Fortran project.
[PATCH, Fortran] Re-fix PR 31292
- From: Steve Kargl <sgk at troutmask dot apl dot washington dot edu>
- To: fortran at gcc dot gnu dot org, gcc-patches at gcc dot gnu dot org
- Date: Fri, 28 Aug 2009 14:34:11 -0700
- Subject: [PATCH, Fortran] Re-fix PR 31292
The attached patch was built and regression tested
on x86_64-*-freebsd. This patch partially un-fixes
the patch applied to fix PR fortran/31292. I've
re-open that PR to track this change.
2009-08-28 Steven G. Kargl <kargl@gcc.gnu.org>
* gfortran.dg/module_procedure_1.f90: New test.
2009-08-28 Steven G. Kargl <kargl@gcc.gnu.org>
* fortran/decl.c: Module procedure can appear in PROGRAM and
subprogram scope.
--
Steve
Index: gcc/testsuite/gfortran.dg/module_procedure_1.f90
===================================================================
--- gcc/testsuite/gfortran.dg/module_procedure_1.f90 (revision 0)
+++ gcc/testsuite/gfortran.dg/module_procedure_1.f90 (revision 0)
@@ -0,0 +1,53 @@
+! { dg-do run }
+! Modified program from http://groups.google.com/group/\
+! comp.lang.fortran/browse_frm/thread/423e4392dc965ab7#
+!
+module myoperator
+ contains
+ function dadd(arg1,arg2)
+ integer ::dadd(2)
+ integer, intent(in) :: arg1(2), arg2(2)
+ dadd(1)=arg1(1)+arg2(1)
+ dadd(2)=arg1(2)+arg2(2)
+ end function dadd
+end module myoperator
+
+program test_interface
+
+ use myoperator
+
+ implicit none
+
+ interface operator (.myadd.)
+ module procedure dadd
+ end interface
+
+ integer input1(2), input2(2), mysum(2)
+
+ input1 = (/0,1/)
+ input2 = (/3,3/)
+ mysum = input1 .myadd. input2
+ if (mysum(1) /= 3 .and. mysum(2) /= 4) call abort
+
+ call test_sub(input1, input2)
+
+end program test_interface
+
+subroutine test_sub(input1, input2)
+
+ use myoperator
+
+ implicit none
+
+ interface operator (.myadd.)
+ module procedure dadd
+ end interface
+
+ integer, intent(in) :: input1(2), input2(2)
+ integer mysum(2)
+
+ mysum = input1 .myadd. input2
+ if (mysum(1) /= 3 .and. mysum(2) /= 4) call abort
+
+end subroutine test_sub
+! { dg-final { cleanup-modules "myoperator" } }
Index: gcc/fortran/decl.c
===================================================================
--- gcc/fortran/decl.c (revision 151144)
+++ gcc/fortran/decl.c (working copy)
@@ -6481,7 +6481,10 @@ gfc_match_modproc (void)
module_ns = gfc_current_ns->parent;
for (; module_ns; module_ns = module_ns->parent)
- if (module_ns->proc_name->attr.flavor == FL_MODULE)
+ if (module_ns->proc_name->attr.flavor == FL_MODULE
+ || module_ns->proc_name->attr.flavor == FL_PROGRAM
+ || (module_ns->proc_name->attr.flavor == FL_PROCEDURE
+ && !module_ns->proc_name->attr.contained))
break;
if (module_ns == NULL)