diff options
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 27 |
2 files changed, 29 insertions, 4 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index ac1eaf6..5bcfb64 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2008-10-12 Daniel Kraft <d@domob.eu> + + PR fortran/37688 + * expr.c (gfc_expr_check_typed): Extend permission of untyped + expressions to both top-level variable and basic arithmetic expressions. + 2008-10-12 Paul Thomas <pault@gcc.gnu.org> PR fortran/37787 diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 5a167b7..73f2c40 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -3429,9 +3429,11 @@ gfc_expr_set_symbols_referenced (gfc_expr *expr) /* Walk an expression tree and check each variable encountered for being typed. If strict is not set, a top-level variable is tolerated untyped in -std=gnu - mode; this is for things in legacy-code like: + mode as is a basic arithmetic expression using those; this is for things in + legacy-code like: INTEGER :: arr(n), n + INTEGER :: arr(n + 1), n The namespace is needed for IMPLICIT typing. */ @@ -3458,9 +3460,26 @@ gfc_expr_check_typed (gfc_expr* e, gfc_namespace* ns, bool strict) { bool error_found; - /* If this is a top-level variable, do the check with strict given to us. */ - if (!strict && e->expr_type == EXPR_VARIABLE && !e->ref) - return gfc_check_symbol_typed (e->symtree->n.sym, ns, strict, e->where); + /* If this is a top-level variable or EXPR_OP, do the check with strict given + to us. */ + if (!strict) + { + if (e->expr_type == EXPR_VARIABLE && !e->ref) + return gfc_check_symbol_typed (e->symtree->n.sym, ns, strict, e->where); + + if (e->expr_type == EXPR_OP) + { + gfc_try t = SUCCESS; + + gcc_assert (e->value.op.op1); + t = gfc_expr_check_typed (e->value.op.op1, ns, strict); + + if (t == SUCCESS && e->value.op.op2) + t = gfc_expr_check_typed (e->value.op.op2, ns, strict); + + return t; + } + } /* Otherwise, walk the expression and do it strictly. */ check_typed_ns = ns; |