OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR fortran/91660 (Missing error on invalid type declaration)

Browse Source 
2019-09-05  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/91660
	* decl.c (gfc_match_decl_type_spec): Improve and restore error
	message for malformed types-spec.

2019-09-05  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/91660
	* gfortran.dg/pdt_4.f03: Fix invalid code.
	* gfortran.dg/pr91660_1.f90: New test.
	* gfortran.dg/pr91660_2.f90: Ditto.

From-SVN: r275426
This commit is contained in:
Steven G. Kargl 2019-09-05 18:14:34 +00:00
parent bb64bef659
commit 0e521c6461
6 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/fortran/ChangeLog
View File

@ -1,3 +1,9 @@
2019-09-05 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/91660
* decl.c (gfc_match_decl_type_spec): Improve and restore error
message for malformed types-spec.
2019-09-04 Steven G. Kargl <kargl@gcvc.gnu.org>
PR fortran/91650

25
gcc/fortran/decl.c
View File

@ -4023,7 +4023,6 @@ gfc_match_decl_type_spec (gfc_typespec *ts, int implicit_flag)
return MATCH_YES;
}
m = gfc_match (" type (");
matched_type = (m == MATCH_YES);
if (matched_type)
@ -4071,7 +4070,10 @@ gfc_match_decl_type_spec (gfc_typespec *ts, int implicit_flag)
m = MATCH_YES;
if (matched_type && m == MATCH_YES && gfc_match_char (')') != MATCH_YES)
m = MATCH_ERROR;
{
gfc_error ("Malformed type-spec at %C");
return MATCH_ERROR;
}
return m;
}
@ -4094,8 +4096,12 @@ gfc_match_decl_type_spec (gfc_typespec *ts, int implicit_flag)
&& !gfc_notify_std (GFC_STD_F2008, "TYPE with "
"intrinsic-type-spec at %C"))
return MATCH_ERROR;
if (matched_type && gfc_match_char (')') != MATCH_YES)
return MATCH_ERROR;
{
gfc_error ("Malformed type-spec at %C");
return MATCH_ERROR;
}
ts->type = BT_REAL;
ts->kind = gfc_default_double_kind;
@ -4125,7 +4131,10 @@ gfc_match_decl_type_spec (gfc_typespec *ts, int implicit_flag)
return MATCH_ERROR;
if (matched_type && gfc_match_char (')') != MATCH_YES)
return MATCH_ERROR;
{
gfc_error ("Malformed type-spec at %C");
return MATCH_ERROR;
}
ts->type = BT_COMPLEX;
ts->kind = gfc_default_double_kind;
@ -4146,7 +4155,13 @@ gfc_match_decl_type_spec (gfc_typespec *ts, int implicit_flag)
if (m == MATCH_ERROR)
return m;
m = gfc_match_char (')');
gfc_gobble_whitespace ();
if (gfc_peek_ascii_char () != ')')
{
gfc_error ("Malformed type-spec at %C");
return MATCH_ERROR;
}
m = gfc_match_char (')'); /* Burn closing ')'. */
}
if (m != MATCH_YES)

7
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,10 @@
2019-09-05 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/91660
* gfortran.dg/pdt_4.f03: Fix invalid code.
* gfortran.dg/pr91660_1.f90: New test.
* gfortran.dg/pr91660_2.f90: Ditto.
2019-09-05 Marek Polacek <polacek@redhat.com>
PR c++/91644 - ICE with constinit in function template.

4
gcc/testsuite/gfortran.dg/pdt_4.f03
View File

@ -97,9 +97,9 @@ contains
type (mytype(4, *)) :: arg ! OK
end subroutine
subroutine bar(arg) ! { dg-error "is neither allocatable nor a pointer" }
type (thytype(8, :, 4) :: arg
type (thytype(8, :, 4)) :: arg
end subroutine
subroutine foobar(arg) ! OK
type (thytype(8, *, 4) :: arg
type (thytype(8, *, 4)) :: arg
end subroutine
end

9
gcc/testsuite/gfortran.dg/pr91660_1.f90 Normal file
View File

@ -0,0 +1,9 @@
! { dg-do compile }
! PR fortran/91660
! Code contributed by Gerhard Steinmetz
program p
type t
end type
type (t x ! { dg-error "Malformed type-spec" }
x = t() ! { dg-error "Cannot convert" }
end

9
gcc/testsuite/gfortran.dg/pr91660_2.f90 Normal file
View File

@ -0,0 +1,9 @@
! { dg-do compile }
! PR fortran/91660
program foo
type(doubleprecision :: x ! { dg-error "Malformed type-spec" }
type(double precision :: y ! { dg-error "Malformed type-spec" }
type(character(len=3) :: a ! { dg-error "Malformed type-spec" }
type(doublecomplex :: b ! { dg-error "Malformed type-spec" }
type(double complex :: c ! { dg-error "Malformed type-spec" }
end program foo