aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/expr.c
diff options
context:
space:
mode:
authorDaniel Kraft <d@domob.eu>2008-10-12 12:51:11 +0200
committerDaniel Kraft <domob@gcc.gnu.org>2008-10-12 12:51:11 +0200
commited42adef4426b71f8f8fecac981a19c29335d454 (patch)
tree23031fbbfc7aa96f18536b69167a41bc34e0561a /gcc/fortran/expr.c
parentb803690ae11b1e540a5032aefd0a72c25231e795 (diff)
downloadgcc-ed42adef4426b71f8f8fecac981a19c29335d454.zip
gcc-ed42adef4426b71f8f8fecac981a19c29335d454.tar.gz
gcc-ed42adef4426b71f8f8fecac981a19c29335d454.tar.bz2
re PR fortran/37688 (Relax "Symbol is used before it is typed" checking)
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 Daniel Kraft <d@domob.eu> PR fortran/37688 * gfortran.dg/used_before_typed_6.f90: New test. From-SVN: r141074
Diffstat (limited to 'gcc/fortran/expr.c')
-rw-r--r--gcc/fortran/expr.c27
1 files changed, 23 insertions, 4 deletions
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;