diff options
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 14 | ||||
| -rw-r--r-- | gcc/fortran/dependency.h | 1 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 27 | ||||
| -rw-r--r-- | gcc/fortran/gfortran.h | 3 |
4 files changed, 44 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 2100d5c3acb..b5220e1f927 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,17 @@ +2006-01-28 Paul Thomas <pault@gcc.gnu.org> + + PR fortran/17911 + * expr.c (gfc_check_assign, gfc_check_pointer_assign): Emit error if + the lvalue is a use associated procedure. + + PR fortran/20895 + PR fortran/25030 + * expr.c (gfc_check_pointer_assign): Emit error if lvalue and rvalue + character lengths are not the same. Use gfc_dep_compare_expr for the + comparison. + * gfortran.h: Add prototype for gfc_dep_compare_expr. + * dependency.h: Remove prototype for gfc_dep_compare_expr. + 2005-01-27 Paul Thomas <pault@gcc.gnu.org> PR fortran/25964 diff --git a/gcc/fortran/dependency.h b/gcc/fortran/dependency.h index 7ef2edd97e5..719f444a8ca 100644 --- a/gcc/fortran/dependency.h +++ b/gcc/fortran/dependency.h @@ -27,7 +27,6 @@ int gfc_check_fncall_dependency (gfc_expr *, sym_intent, gfc_symbol *, gfc_actual_arglist *); int gfc_check_dependency (gfc_expr *, gfc_expr *, gfc_expr **, int); int gfc_is_same_range (gfc_array_ref *, gfc_array_ref *, int, int); -int gfc_dep_compare_expr (gfc_expr *, gfc_expr *); int gfc_expr_is_one (gfc_expr *, int); int gfc_dep_resolver(gfc_ref *, gfc_ref *); diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 11bf277ae58..0e699c26de7 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -1859,6 +1859,14 @@ gfc_check_assign (gfc_expr * lvalue, gfc_expr * rvalue, int conform) return FAILURE; } + if (sym->attr.flavor == FL_PROCEDURE && sym->attr.use_assoc) + { + gfc_error ("'%s' in the assignment at %L cannot be an l-value " + "since it is a procedure", sym->name, &lvalue->where); + return FAILURE; + } + + if (rvalue->rank != 0 && lvalue->rank != rvalue->rank) { gfc_error ("Incompatible ranks %d and %d in assignment at %L", @@ -1944,6 +1952,15 @@ gfc_check_pointer_assign (gfc_expr * lvalue, gfc_expr * rvalue) return FAILURE; } + if (lvalue->symtree->n.sym->attr.flavor == FL_PROCEDURE + && lvalue->symtree->n.sym->attr.use_assoc) + { + gfc_error ("'%s' in the pointer assignment at %L cannot be an " + "l-value since it is a procedure", + lvalue->symtree->n.sym->name, &lvalue->where); + return FAILURE; + } + attr = gfc_variable_attr (lvalue, NULL); if (!attr.pointer) { @@ -1980,6 +1997,16 @@ gfc_check_pointer_assign (gfc_expr * lvalue, gfc_expr * rvalue) return FAILURE; } + if (lvalue->ts.type == BT_CHARACTER + && lvalue->ts.cl->length && rvalue->ts.cl->length + && abs (gfc_dep_compare_expr (lvalue->ts.cl->length, + rvalue->ts.cl->length)) == 1) + { + gfc_error ("Different character lengths in pointer " + "assignment at %L", &lvalue->where); + return FAILURE; + } + attr = gfc_expr_attr (rvalue); if (!attr.target && !attr.pointer) { diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h index c8813ec070a..a1aaaf09967 100644 --- a/gcc/fortran/gfortran.h +++ b/gcc/fortran/gfortran.h @@ -1967,4 +1967,7 @@ void gfc_show_namespace (gfc_namespace *); try gfc_parse_file (void); void global_used (gfc_gsymbol *, locus *); +/* dependency.c */ +int gfc_dep_compare_expr (gfc_expr *, gfc_expr *); + #endif /* GCC_GFORTRAN_H */ |
