aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/primary.c
diff options
context:
space:
mode:
authorDaniel Kraft <d@domob.eu>2008-09-05 13:56:23 +0200
committerDaniel Kraft <domob@gcc.gnu.org>2008-09-05 13:56:23 +0200
commitebac6d9cb9f255b379fffcff4ba871d5b74d39d7 (patch)
treec4c56bb9e4866146e02d77626b3ddd228ce9dee8 /gcc/fortran/primary.c
parent719bb4e3d3f7d9e3e59f97141a54fe633a77b46d (diff)
downloadgcc-ebac6d9cb9f255b379fffcff4ba871d5b74d39d7.zip
gcc-ebac6d9cb9f255b379fffcff4ba871d5b74d39d7.tar.gz
gcc-ebac6d9cb9f255b379fffcff4ba871d5b74d39d7.tar.bz2
re PR fortran/36746 (Rejects variable which is implictly typed as derived typed with DIMENSION)
2008-09-05 Daniel Kraft <d@domob.eu> PR fortran/36746 * primary.c (gfc_match_rvalue): Removed logic to handle implicit typing to a derived-type if a component reference is found. (gfc_match_varspec): Moved it here. 2008-09-05 Daniel Kraft <d@domob.eu> PR fortran/36746 * gfortran.dg/implicit_derived_type_1.f90: New test. * gfortran.dg/used_before_typed_5.f90: New test. From-SVN: r140034
Diffstat (limited to 'gcc/fortran/primary.c')
-rw-r--r--gcc/fortran/primary.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c
index 6689443..04c24eb7 100644
--- a/gcc/fortran/primary.c
+++ b/gcc/fortran/primary.c
@@ -1745,6 +1745,10 @@ gfc_match_varspec (gfc_expr *primary, int equiv_flag, bool sub_flag)
if (equiv_flag)
return MATCH_YES;
+ if (sym->ts.type == BT_UNKNOWN && gfc_peek_ascii_char () == '%'
+ && gfc_get_default_type (sym, sym->ns)->type == BT_DERIVED)
+ gfc_set_default_type (sym, 0, sym->ns);
+
if (sym->ts.type != BT_DERIVED || gfc_match_char ('%') != MATCH_YES)
goto check_substring;
@@ -2434,10 +2438,6 @@ gfc_match_rvalue (gfc_expr **result)
{
case FL_VARIABLE:
variable:
- if (sym->ts.type == BT_UNKNOWN && gfc_peek_ascii_char () == '%'
- && gfc_get_default_type (sym, sym->ns)->type == BT_DERIVED)
- gfc_set_default_type (sym, 0, sym->ns);
-
e = gfc_get_expr ();
e->expr_type = EXPR_VARIABLE;