* [PATCH] PR fortran/91660 -- Improve and restore error messages
@ 2019-09-05 4:51 Steve Kargl
2019-09-05 7:19 ` Janne Blomqvist
0 siblings, 1 reply; 2+ messages in thread
From: Steve Kargl @ 2019-09-05 4:51 UTC (permalink / raw)
To: fortran, gcc-patches
[-- Attachment #1: Type: text/plain, Size: 655 bytes --]
Built and regression tested on x86_64-*-freebsd.
The patch restores an improved error message for a malformed
type-spec. See pr91660_1.f90 for code demonstrating problem.
While here, improve the error messages for other malformed
type-specs. Sett pr91660_2.f90.
OK to commit?
2019-09-04 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@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.
--
Steve
[-- Attachment #2: pr91660.diff --]
[-- Type: text/x-diff, Size: 3595 bytes --]
Index: gcc/fortran/decl.c
===================================================================
--- gcc/fortran/decl.c (revision 275390)
+++ gcc/fortran/decl.c (working copy)
@@ -4023,7 +4023,6 @@ gfc_match_decl_type_spec (gfc_typespec *ts, int implic
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 implic
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 implic
&& !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 implic
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 implic
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)
Index: gcc/testsuite/gfortran.dg/pdt_4.f03
===================================================================
--- gcc/testsuite/gfortran.dg/pdt_4.f03 (revision 275390)
+++ gcc/testsuite/gfortran.dg/pdt_4.f03 (working copy)
@@ -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
Index: gcc/testsuite/gfortran.dg/pr91660_1.f90
===================================================================
--- gcc/testsuite/gfortran.dg/pr91660_1.f90 (nonexistent)
+++ gcc/testsuite/gfortran.dg/pr91660_1.f90 (working copy)
@@ -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
Index: gcc/testsuite/gfortran.dg/pr91660_2.f90
===================================================================
--- gcc/testsuite/gfortran.dg/pr91660_2.f90 (nonexistent)
+++ gcc/testsuite/gfortran.dg/pr91660_2.f90 (working copy)
@@ -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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] PR fortran/91660 -- Improve and restore error messages
2019-09-05 4:51 [PATCH] PR fortran/91660 -- Improve and restore error messages Steve Kargl
@ 2019-09-05 7:19 ` Janne Blomqvist
0 siblings, 0 replies; 2+ messages in thread
From: Janne Blomqvist @ 2019-09-05 7:19 UTC (permalink / raw)
To: Steve Kargl; +Cc: Fortran List, GCC Patches
On Thu, Sep 5, 2019 at 7:51 AM Steve Kargl
<sgk@troutmask.apl.washington.edu> wrote:
>
> Built and regression tested on x86_64-*-freebsd.
>
> The patch restores an improved error message for a malformed
> type-spec. See pr91660_1.f90 for code demonstrating problem.
> While here, improve the error messages for other malformed
> type-specs. Sett pr91660_2.f90.
>
> OK to commit?
Ok.
--
Janne Blomqvist
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-09-05 7:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-05 4:51 [PATCH] PR fortran/91660 -- Improve and restore error messages Steve Kargl
2019-09-05 7:19 ` Janne Blomqvist
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).