This is the mail archive of the
fortran@gcc.gnu.org
mailing list for the GNU Fortran project.
[Patch, Fortran] PR 34760 - Handle flavor = unknown better to not wrongly make a variable as FL_PROCEDURE
- From: Tobias Burnus <burnus at net-b dot de>
- To: "'fortran at gcc dot gnu dot org'" <fortran at gcc dot gnu dot org>, gcc-patches <gcc-patches at gcc dot gnu dot org>
- Date: Sat, 19 Jan 2008 15:13:41 +0100
- Subject: [Patch, Fortran] PR 34760 - Handle flavor = unknown better to not wrongly make a variable as FL_PROCEDURE
In the old days (i.e. before July last year), the following was rejected
(PR 32760)
module gfcbug68
public :: print
contains
! call somewhere "print *,"
subroutine print
as the "print" was matched as variable (with FL_UNKNOWN) and assigned
FL_VARIABLE. The solution was not to set the flavor for PUBLIC/PRIVATE.
This, however, caused a problem with PR34760 since it rejects:
module m
integer, private :: istat
...
allocate(array(5), stat=istat)
as "istat" is FL_UNKNOWN and thus not a variable.
The attached patch tried to handle this; I am not positive that I forgot
a construct, but it should work for a lot of constructs and especially
it works with the one above.
As PR 34871 shows, there is still an accepts-invalid problem, which does
not seem to be neither a regression nor related to this patch.
Build and regression tested on x86-64-linux. OK for the trunk?
Tobias
2008-01-19 Tobias Burnus <burnus@net-b.de>
PR fortran/34760
* primary.c (match_variable): Handle FL_UNKNOWN without
uneducated guessing.
(match_variable): Improve error message.
2008-01-19 Tobias Burnus <burnus@net-b.de>
PR fortran/34760
* gfortran.dg/implicit_11.f90: New.
* gfortran.dg/allocate_stat.f90: Update dg-error pattern.
* gfortran.dg/entry_15.f90: Ditto.
* gfortran.dg/func_assign.f90: Ditto.
* gfortran.dg/gomp/reduction3.f90: Ditto.
* gfortran.dg/proc_assign_1.f90: Ditto.
* gfortran.dg/interface_proc_end.f90: Use dg-error instead
of dg-excess-errors.
Index: gcc/fortran/primary.c
===================================================================
--- gcc/fortran/primary.c (revision 131650)
+++ gcc/fortran/primary.c (working copy)
@@ -2521,12 +2521,22 @@ match_variable (gfc_expr **result, int e
break;
case FL_UNKNOWN:
- if (sym->attr.access == ACCESS_PUBLIC
- || sym->attr.access == ACCESS_PRIVATE)
- break;
- if (gfc_add_flavor (&sym->attr, FL_VARIABLE,
- sym->name, NULL) == FAILURE)
- return MATCH_ERROR;
+ {
+ sym_flavor flavor = FL_UNKNOWN;
+
+ gfc_gobble_whitespace ();
+
+ if (sym->attr.external || sym->attr.procedure
+ || sym->attr.function || sym->attr.subroutine)
+ flavor = FL_PROCEDURE;
+ else if (gfc_peek_char () != '(' || sym->ts.type != BT_UNKNOWN
+ || sym->attr.pointer || sym->as != NULL)
+ flavor = FL_VARIABLE;
+
+ if (flavor != FL_UNKNOWN
+ && gfc_add_flavor (&sym->attr, flavor, sym->name, NULL) == FAILURE)
+ return MATCH_ERROR;
+ }
break;
case FL_PARAMETER:
@@ -2553,7 +2563,7 @@ match_variable (gfc_expr **result, int e
/* Fall through to error */
default:
- gfc_error ("Expected VARIABLE at %C");
+ gfc_error ("'%s' at %C is not a variable", sym->name);
return MATCH_ERROR;
}
Index: gcc/testsuite/gfortran.dg/gomp/reduction3.f90
===================================================================
--- gcc/testsuite/gfortran.dg/gomp/reduction3.f90 (revision 131650)
+++ gcc/testsuite/gfortran.dg/gomp/reduction3.f90 (working copy)
@@ -48,7 +48,7 @@ subroutine f4
integer :: i, ior
i = 6
!$omp parallel reduction (ior:i)
- ior = 4 ! { dg-error "Expected VARIABLE" }
+ ior = 4 ! { dg-error "is not a variable" }
!$omp end parallel
end subroutine f4
subroutine f5
Index: gcc/testsuite/gfortran.dg/allocate_stat.f90
===================================================================
--- gcc/testsuite/gfortran.dg/allocate_stat.f90 (revision 131650)
+++ gcc/testsuite/gfortran.dg/allocate_stat.f90 (working copy)
@@ -38,7 +38,7 @@ function func2() result(res)
implicit none
real, pointer :: gain
integer :: res
- allocate (gain,STAT=func2) ! { dg-error "Expected VARIABLE" }
+ allocate (gain,STAT=func2) ! { dg-error "is not a variable" }
deallocate(gain)
res = 0
end function func2
Index: gcc/testsuite/gfortran.dg/entry_15.f90
===================================================================
--- gcc/testsuite/gfortran.dg/entry_15.f90 (revision 131650)
+++ gcc/testsuite/gfortran.dg/entry_15.f90 (working copy)
@@ -16,7 +16,7 @@ function func(a)
func = a*8
return
entry ent(a) result(func2)
- ent = -a*4.0 ! { dg-error "Expected VARIABLE" }
+ ent = -a*4.0 ! { dg-error "is not a variable" }
return
end function func
end module m2
@@ -31,7 +31,7 @@ function func(a) result(res)
res = a*12
return
entry ent(a) result(func2)
- ent = -a*6.0 ! { dg-error "Expected VARIABLE" }
+ ent = -a*6.0 ! { dg-error "is not a variable" }
return
end function func
end module m3
Index: gcc/testsuite/gfortran.dg/interface_proc_end.f90
===================================================================
--- gcc/testsuite/gfortran.dg/interface_proc_end.f90 (revision 131650)
+++ gcc/testsuite/gfortran.dg/interface_proc_end.f90 (working copy)
@@ -16,4 +16,4 @@
END INTERFACE
end ! { dg-error "END SUBROUTINE statement" }
end module ! { dg-error "END SUBROUTINE statement" }
-! { dg-excess-errors "Unexpected end of file" }
+! { dg-error "Unexpected end of file" "" { target "*-*-*" } 0 }
Index: gcc/testsuite/gfortran.dg/func_assign.f90
===================================================================
--- gcc/testsuite/gfortran.dg/func_assign.f90 (revision 131650)
+++ gcc/testsuite/gfortran.dg/func_assign.f90 (working copy)
@@ -23,8 +23,8 @@ contains
subroutine sub()
end subroutine sub
end interface
- sub = 'a' ! { dg-error "Expected VARIABLE" }
- fun = 4.4 ! { dg-error "Expected VARIABLE" }
+ sub = 'a' ! { dg-error "is not a variable" }
+ fun = 4.4 ! { dg-error "is not a variable" }
funget = 4 ! { dg-error "is not a VALUE" }
bar = 5 ! { dg-error "is not a VALUE" }
end subroutine a
Index: gcc/testsuite/gfortran.dg/proc_assign_1.f90
===================================================================
--- gcc/testsuite/gfortran.dg/proc_assign_1.f90 (revision 131650)
+++ gcc/testsuite/gfortran.dg/proc_assign_1.f90 (working copy)
@@ -58,12 +58,12 @@ end module simpler
end interface
stmt_fcn (w) = sin (w)
call x (y ())
- x = 10 ! { dg-error "Expected VARIABLE" }
+ x = 10 ! { dg-error "is not a variable" }
y = 20 ! { dg-error "is not a VALUE" }
foo_er = 8 ! { dg-error "is not a VALUE" }
ext1 = 99 ! { dg-error "is not a VALUE" }
ext2 = 99 ! { dg-error "is not a VALUE" }
- stmt_fcn = 1.0 ! { dg-error "Expected VARIABLE" }
+ stmt_fcn = 1.0 ! { dg-error "is not a variable" }
w = stmt_fcn (1.0)
contains
subroutine x (i)
Index: gcc/testsuite/gfortran.dg/implicit_11.f90
===================================================================
--- gcc/testsuite/gfortran.dg/implicit_11.f90 (revision 0)
+++ gcc/testsuite/gfortran.dg/implicit_11.f90 (revision 0)
@@ -0,0 +1,38 @@
+! { dg-do compile }
+!
+! PR fortran/34760
+! The problem with implict typing is that it is unclear
+! whether an existing symbol is a variable or a function.
+! Thus it remains long FL_UNKNOWN, which causes extra
+! problems; it was failing here since ISTAT was not
+! FL_VARIABLE but still FL_UNKNOWN.
+!
+! Test case contributed by Dick Hendrickson.
+!
+ MODULE TESTS
+ PRIVATE :: ISTAT
+ PUBLIC :: ISTAT2
+ CONTAINS
+ SUBROUTINE AD0001
+ REAL RLA1(:)
+ ALLOCATABLE RLA1
+ ISTAT = -314
+ ALLOCATE (RLA1(NF10), STAT = ISTAT)
+ ALLOCATE (RLA1(NF10), STAT = ISTAT2)
+ END SUBROUTINE
+ END MODULE
+
+ MODULE TESTS2
+ PRIVATE :: ISTAT2
+ CONTAINS
+ function istat2()
+ istat2 = 0
+ end function istat2
+ SUBROUTINE AD0001
+ REAL RLA1(:)
+ ALLOCATABLE RLA1
+ ALLOCATE (RLA1(NF10), STAT = ISTAT2) ! { dg-error "must be a variable" }
+ END SUBROUTINE
+ END MODULE tests2
+
+! { dg-final { cleanup-modules "TESTS" } }