diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2016-12-03 19:37:57 +0100 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2016-12-03 19:37:57 +0100 |
| commit | 20fee4a901c0cf097df1f1ba00e226f1eb8e973c (patch) | |
| tree | 014274d5a630a611d4c4797b400723bc6b25a9b0 /gcc | |
| parent | 54b84aa9456004ceee2bceb813843525ee11bd7d (diff) | |
| download | gcc-20fee4a901c0cf097df1f1ba00e226f1eb8e973c.zip gcc-20fee4a901c0cf097df1f1ba00e226f1eb8e973c.tar.gz gcc-20fee4a901c0cf097df1f1ba00e226f1eb8e973c.tar.bz2 | |
re PR fortran/42188 ([OOP] F03:C612. The leftmost part-name shall be the name of a data object.)
2016-12-03 Janus Weil <janus@gcc.gnu.org>
PR fortran/42188
* primary.c (gfc_match_rvalue): Add a new check that gives better error
messages.
2016-12-03 Janus Weil <janus@gcc.gnu.org>
PR fortran/42188
* gfortran.dg/derived_result_2.f90.f90: New test case.
From-SVN: r243223
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/primary.c | 9 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/derived_result_2.f90 | 45 |
4 files changed, 65 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 7a007c3..eaae696 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,11 @@ 2016-12-03 Janus Weil <janus@gcc.gnu.org> + PR fortran/42188 + * primary.c (gfc_match_rvalue): Add a new check that gives better error + messages. + +2016-12-03 Janus Weil <janus@gcc.gnu.org> + PR fortran/58175 * resolve.c (gfc_resolve_finalizers): Prevent bogus warning. diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c index eb2d780..2cdc9a4 100644 --- a/gcc/fortran/primary.c +++ b/gcc/fortran/primary.c @@ -3298,6 +3298,15 @@ gfc_match_rvalue (gfc_expr **result) if (sym->result == NULL) sym->result = sym; + gfc_gobble_whitespace (); + /* F08:C612. */ + if (gfc_peek_ascii_char() == '%') + { + gfc_error ("The leftmost part-ref in a data-ref can not be a " + "function reference at %C"); + m = MATCH_ERROR; + } + m = MATCH_YES; break; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 39a5c59..0d95973 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2016-12-03 Janus Weil <janus@gcc.gnu.org> + PR fortran/42188 + * gfortran.dg/derived_result_2.f90.f90: New test case. + +2016-12-03 Janus Weil <janus@gcc.gnu.org> + PR fortran/58175 * gfortran.dg/finalize_30.f90: Extend test case. diff --git a/gcc/testsuite/gfortran.dg/derived_result_2.f90 b/gcc/testsuite/gfortran.dg/derived_result_2.f90 new file mode 100644 index 0000000..51f5b86 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/derived_result_2.f90 @@ -0,0 +1,45 @@ +! { dg-do compile } +! +! PR 42188: [OOP] F03:C612. The leftmost part-name shall be the name of a data object +! +! Contributed by Janus Weil <janus@gcc.gnu.org> + +module grid_module + implicit none + type grid + contains + procedure :: new_grid + procedure :: new_int + end type +contains + subroutine new_grid(this) + class(grid) :: this + end subroutine + integer function new_int(this) + class(grid) :: this + new_int = 42 + end function +end module + +module field_module + use grid_module + implicit none + + type field + type(grid) :: mesh + end type + +contains + + type(field) function new_field() + end function + + subroutine test + integer :: i + type(grid) :: g + g = new_field()%mesh ! { dg-error "can not be a function reference" } + call new_field()%mesh%new_grid() ! { dg-error "Syntax error" } + i = new_field() % mesh%new_int() ! { dg-error "can not be a function reference" } + end subroutine + +end module |