diff options
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 11 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 7 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 20 | ||||
| -rw-r--r-- | gcc/fortran/simplify.c | 12 |
4 files changed, 31 insertions, 19 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 115e3c2..ca34144 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,14 @@ +2006-02-10 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. + + 2006-02-10 Tobias Schlüter <tobias.schlueter@physik.uni-muenchen.de> PR fortran/14771 diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 7a80f81..0f2436a 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -1203,7 +1203,7 @@ variable_decl (int elem) m = gfc_match_null (&initializer); if (m == MATCH_NO) { - gfc_error ("Pointer initialization requires a NULL at %C"); + gfc_error ("Pointer initialization requires a NULL() at %C"); m = MATCH_ERROR; } @@ -1218,8 +1218,6 @@ variable_decl (int elem) if (m != MATCH_YES) goto cleanup; - initializer->ts = current_ts; - } else if (gfc_match_char ('=') == MATCH_YES) { @@ -1282,7 +1280,8 @@ variable_decl (int elem) t = add_init_expr_to_sym (name, &initializer, &var_locus); else { - if (current_ts.type == BT_DERIVED && !current_attr.pointer && !initializer) + if (current_ts.type == BT_DERIVED && !current_attr.pointer + && !initializer) initializer = gfc_default_initializer (¤t_ts); t = build_struct (name, cl, &initializer, &as); } 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 " diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index 894903b..b477078 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -2528,16 +2528,14 @@ gfc_simplify_null (gfc_expr * mold) { gfc_expr *result; - result = gfc_get_expr (); - result->expr_type = EXPR_NULL; - if (mold == NULL) - result->ts.type = BT_UNKNOWN; - else { - result->ts = mold->ts; - result->where = mold->where; + result = gfc_get_expr (); + result->ts.type = BT_UNKNOWN; } + else + result = gfc_copy_expr (mold); + result->expr_type = EXPR_NULL; return result; } |