diff options
| author | Steven G. Kargl <kargls@comcast.net> | 2006-02-10 19:01:05 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2006-02-10 19:01:05 +0000 |
| commit | def661340610359e6eea3cdd4189089b3b9b7acd (patch) | |
| tree | 47904c72572a1f413c0df6b9172a66991423a611 /gcc/fortran/expr.c | |
| parent | 6f4d3d86564db6a42ffb8ffa8960cc32129ab581 (diff) | |
| download | gcc-def661340610359e6eea3cdd4189089b3b9b7acd.zip gcc-def661340610359e6eea3cdd4189089b3b9b7acd.tar.gz gcc-def661340610359e6eea3cdd4189089b3b9b7acd.tar.bz2 | |
re PR fortran/20858 (NULL doesn't get its argument type (kind))
2006-02-05 Steven G. Kargl <kargls@comcast.net>
PR fortran/20858
*decl.c (variable_decl): Improve error message. Remove initialization
typespec. Wrap long line.
*expr.c (gfc_check_pointer_assign): Permit checking of type, kind type,
and rank.
*simplify.c (gfc_simplify_null): Ensure type, kind type, and rank are set.
gfortran.dg/null_1.f90: New test.
From-SVN: r110845
Diffstat (limited to 'gcc/fortran/expr.c')
| -rw-r--r-- | gcc/fortran/expr.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 28a2fc8..6db1c6b 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -1984,7 +1984,7 @@ gfc_check_pointer_assign (gfc_expr * lvalue, gfc_expr * rvalue) /* If rvalue is a NULL() or NULLIFY, we're done. Otherwise the type, kind, etc for lvalue and rvalue must match, and rvalue must be a pure variable if we're in a pure function. */ - if (rvalue->expr_type == EXPR_NULL) + if (rvalue->expr_type == EXPR_NULL && rvalue->ts.type == BT_UNKNOWN) return SUCCESS; if (!gfc_compare_types (&lvalue->ts, &rvalue->ts)) @@ -2001,6 +2001,17 @@ gfc_check_pointer_assign (gfc_expr * lvalue, gfc_expr * rvalue) return FAILURE; } + if (lvalue->rank != rvalue->rank) + { + gfc_error ("Different ranks in pointer assignment at %L", + &lvalue->where); + return FAILURE; + } + + /* Now punt if we are dealing with a NULLIFY(X) or X = NULL(X). */ + if (rvalue->expr_type == EXPR_NULL) + return SUCCESS; + if (lvalue->ts.type == BT_CHARACTER && lvalue->ts.cl->length && rvalue->ts.cl->length && abs (gfc_dep_compare_expr (lvalue->ts.cl->length, @@ -2025,13 +2036,6 @@ gfc_check_pointer_assign (gfc_expr * lvalue, gfc_expr * rvalue) "procedure at %L", &rvalue->where); } - if (lvalue->rank != rvalue->rank) - { - gfc_error ("Unequal ranks %d and %d in pointer assignment at %L", - lvalue->rank, rvalue->rank, &rvalue->where); - return FAILURE; - } - if (gfc_has_vector_index (rvalue)) { gfc_error ("Pointer assignment with vector subscript " |