git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

decl.c (gfc_match_entry): Allow END besides END SUBROUTINE/END FUNCTION for contained procedures. 

2010-06-25  Tobias Burnus  <burnus@net-b.de>

        * decl.c (gfc_match_entry): Allow END besides
        END SUBROUTINE/END FUNCTION for contained procedures.

2010-06-25  Tobias Burnus  <burnus@net-b.de>

        * gfortran.dg/end_subroutine_1.f90: New.
        * gfortran.dg/end_subroutine_2.f90: New.
        * gfortran.dg/interface_proc_end.f90: Update.

From-SVN: r161406
This commit is contained in:
Tobias Burnus 2010-06-25 21:02:47 +02:00 committed by Tobias Burnus
parent c6c73c51ca
commit 272001a244
6 changed files with 61 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/fortran/ChangeLog
View File

@ -1,3 +1,8 @@
2010-06-25 Tobias Burnus <burnus@net-b.de>
* decl.c (gfc_match_entry): Allow END besides
END SUBROUTINE/END FUNCTION for contained procedures.
2010-06-25 Tobias Burnus <burnus@net-b.de>
* parse.c (next_free, next_fixed): Allow ";" as first character.

9
gcc/fortran/decl.c
View File

@ -5642,7 +5642,14 @@ gfc_match_end (gfc_statement *st)
if (gfc_match_eos () == MATCH_YES)
{
if (!eos_ok)
if (!eos_ok && (*st == ST_END_SUBROUTINE || *st == ST_END_FUNCTION))
{
if (gfc_notify_std (GFC_STD_F2008, "Fortran 2008: END statement "
"instead of %s statement at %L",
gfc_ascii_statement (*st), &old_loc) == FAILURE)
goto cleanup;
}
else if (!eos_ok)
{
/* We would have required END [something]. */
gfc_error ("%s statement expected at %L",

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2010-06-25 Tobias Burnus <burnus@net-b.de>
* gfortran.dg/end_subroutine_1.f90: New.
* gfortran.dg/end_subroutine_2.f90: New.
* gfortran.dg/interface_proc_end.f90: Update.
2010-06-25 Tobias Burnus <burnus@net-b.de>
* gfortran.dg/semicolon_fixed.f: Update.

16
gcc/testsuite/gfortran.dg/end_subroutine_1.f90 Normal file
View File

@ -0,0 +1,16 @@
! { dg-do compile }
! { dg-options "-std=f2008" }
!
interface
subroutine foo()
end
integer function bar()
end
end interface
contains
subroutine test()
end
integer function f()
f = 42
end
end

24
gcc/testsuite/gfortran.dg/end_subroutine_2.f90 Normal file
View File

@ -0,0 +1,24 @@
! { dg-do compile }
! { dg-options "-std=f2003" }
!
program main
interface
subroutine foo()
end
integer function bar()
end
end interface
contains
subroutine test()
end ! { dg-error "Fortran 2008: END statement instead of END SUBROUTINE" }
end subroutine ! To silence successive errors
end program
subroutine test2()
contains
integer function f()
f = 42
end ! { dg-error "Fortran 2008: END statement instead of END FUNCTION" }
end function ! To silence successive errors
end subroutine test2

5
gcc/testsuite/gfortran.dg/interface_proc_end.f90
View File

@ -14,6 +14,5 @@
REAL :: TLS1,TLS2
END ! OK
END INTERFACE
end ! { dg-error "END SUBROUTINE statement" }
end module ! { dg-error "END SUBROUTINE statement" }
! { dg-error "Unexpected end of file" "" { target "*-*-*" } 0 }
end subroutine
end module