aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/decl.c
diff options
context:
space:
mode:
authorSteven G. Kargl <kargl@gcc.gnu.org>2019-09-29 16:19:58 +0000
committerSteven G. Kargl <kargl@gcc.gnu.org>2019-09-29 16:19:58 +0000
commitc4770ba091d96aea469c79067b549bbc8f8c7c63 (patch)
treed5bc26b758645c10a29c87d7551a7ae84021ebf9 /gcc/fortran/decl.c
parent56b070e3bbc4364f86357d6651fe1391464db6d6 (diff)
downloadgcc-c4770ba091d96aea469c79067b549bbc8f8c7c63.zip
gcc-c4770ba091d96aea469c79067b549bbc8f8c7c63.tar.gz
gcc-c4770ba091d96aea469c79067b549bbc8f8c7c63.tar.bz2
re PR fortran/91714 (Accepts type statement without delimiter in free form)
2019-09-29 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/91714 * decl.c (gfc_match_decl_type_spec): Issue errors for a few mangled types. 2019-09-29 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/91714 * gfortran.dg/dec_type_print_3.f90: Update dg-error regex. * gfortran.dg/pr91714.f90: New test. From-SVN: r276270
Diffstat (limited to 'gcc/fortran/decl.c')
-rw-r--r--gcc/fortran/decl.c22
1 files changed, 20 insertions, 2 deletions
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index b6add1c..3ba61a0 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -4444,6 +4444,7 @@ get_kind:
gfc_next_ascii_char ();
return MATCH_YES;
}
+ gfc_error ("Malformed type-spec at %C");
return MATCH_NO;
}
}
@@ -4457,7 +4458,10 @@ get_kind:
}
if (matched_type && gfc_match_char (')') != MATCH_YES)
- return MATCH_ERROR;
+ {
+ gfc_error ("Malformed type-spec at %C");
+ return MATCH_ERROR;
+ }
/* Defer association of the KIND expression of function results
until after USE and IMPORT statements. */
@@ -10240,6 +10244,20 @@ gfc_match_derived_decl (void)
return MATCH_ERROR;
}
+ /* In free source form, need to check for TYPE XXX as oppose to TYPEXXX.
+ But, we need to simply return for TYPE(. */
+ if (m == MATCH_NO && gfc_current_form == FORM_FREE)
+ {
+ char c = gfc_peek_ascii_char ();
+ if (c == '(')
+ return m;
+ if (!gfc_is_whitespace (c))
+ {
+ gfc_error ("Mangled derived type definition at %C");
+ return MATCH_NO;
+ }
+ }
+
m = gfc_match (" %n ", name);
if (m != MATCH_YES)
return m;
@@ -10247,7 +10265,7 @@ gfc_match_derived_decl (void)
/* Make sure that we don't identify TYPE IS (...) as a parameterized
derived type named 'is'.
TODO Expand the check, when 'name' = "is" by matching " (tname) "
- and checking if this is a(n intrinsic) typename. his picks up
+ and checking if this is a(n intrinsic) typename. This picks up
misplaced TYPE IS statements such as in select_type_1.f03. */
if (gfc_peek_ascii_char () == '(')
{