diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2008-07-02 21:53:37 +0200 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2008-07-02 21:53:37 +0200 |
| commit | 8fb74da43bd12ea5008ba9fba2173b455d494b2c (patch) | |
| tree | 22cdfa5a0f9753aaa861e0696994a9d143ec1e49 /gcc/fortran/check.c | |
| parent | 658896fbb85ebf48d21c9a08e405d0916ca1d45a (diff) | |
| download | gcc-8fb74da43bd12ea5008ba9fba2173b455d494b2c.zip gcc-8fb74da43bd12ea5008ba9fba2173b455d494b2c.tar.gz gcc-8fb74da43bd12ea5008ba9fba2173b455d494b2c.tar.bz2 | |
re PR fortran/32580 (iso_c_binding c_f_procpointer / procedure pointers)
2008-07-02 Janus Weil <janus@gcc.gnu.org>
Tobias Burnus <burnus@net-b.de>
Paul Thomas <pault@gcc.gnu.org>
PR fortran/32580
* gfortran.h (struct gfc_symbol): New member "proc_pointer".
* check.c (gfc_check_associated,gfc_check_null): Implement
procedure pointers.
* decl.c (match_procedure_decl): Ditto.
* expr.c (gfc_check_pointer_assign,gfc_check_assign_symbol): Ditto.
* interface.c (compare_actual_formal): Ditto.
* match.h: Ditto.
* match.c (gfc_match_pointer_assignment): Ditto.
* parse.c (parse_interface): Ditto.
* primary.c (gfc_match_rvalue,match_variable): Ditto.
* resolve.c (resolve_fl_procedure): Ditto.
* symbol.c (check_conflict,gfc_add_external,gfc_add_pointer,
gfc_copy_attr,gen_fptr_param,build_formal_args): Ditto.
* trans-decl.c (get_proc_pointer_decl,gfc_get_extern_function_decl,
create_function_arglist): Ditto.
* trans-expr.c (gfc_conv_variable,gfc_conv_function_val,
gfc_conv_function_call,gfc_trans_pointer_assignment): Ditto.
2008-07-02 Janus Weil <janus@gcc.gnu.org>
Tobias Burnus <burnus@net-b.de>
PR fortran/32580
* gfortran.dg/c_f_pointer_tests_3.f90: Updated.
* gfortran.dg/proc_decl_1.f90: Updated.
* gfortran.dg/proc_ptr_1.f90: New.
* gfortran.dg/proc_ptr_2.f90: New.
* gfortran.dg/proc_ptr_3.f90: New.
* gfortran.dg/proc_ptr_4.f90: New.
* gfortran.dg/proc_ptr_5.f90: New.
* gfortran.dg/proc_ptr_6.f90: New.
* gfortran.dg/proc_ptr_7.f90: New.
* gfortran.dg/proc_ptr_8.f90: New.
Co-Authored-By: Paul Thomas <pault@gcc.gnu.org>
Co-Authored-By: Tobias Burnus <burnus@net-b.de>
From-SVN: r137386
Diffstat (limited to 'gcc/fortran/check.c')
| -rw-r--r-- | gcc/fortran/check.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c index 87d962e..c0f9891 100644 --- a/gcc/fortran/check.c +++ b/gcc/fortran/check.c @@ -584,7 +584,7 @@ gfc_check_x_yd (gfc_expr *x, gfc_expr *y) try gfc_check_associated (gfc_expr *pointer, gfc_expr *target) { - symbol_attribute attr; + symbol_attribute attr1, attr2; int i; try t; locus *where; @@ -592,15 +592,15 @@ gfc_check_associated (gfc_expr *pointer, gfc_expr *target) where = &pointer->where; if (pointer->expr_type == EXPR_VARIABLE) - attr = gfc_variable_attr (pointer, NULL); + attr1 = gfc_variable_attr (pointer, NULL); else if (pointer->expr_type == EXPR_FUNCTION) - attr = pointer->symtree->n.sym->attr; + attr1 = pointer->symtree->n.sym->attr; else if (pointer->expr_type == EXPR_NULL) goto null_arg; else gcc_assert (0); /* Pointer must be a variable or a function. */ - if (!attr.pointer) + if (!attr1.pointer && !attr1.proc_pointer) { gfc_error ("'%s' argument of '%s' intrinsic at %L must be a POINTER", gfc_current_intrinsic_arg[0], gfc_current_intrinsic, @@ -617,9 +617,9 @@ gfc_check_associated (gfc_expr *pointer, gfc_expr *target) goto null_arg; if (target->expr_type == EXPR_VARIABLE) - attr = gfc_variable_attr (target, NULL); + attr2 = gfc_variable_attr (target, NULL); else if (target->expr_type == EXPR_FUNCTION) - attr = target->symtree->n.sym->attr; + attr2 = target->symtree->n.sym->attr; else { gfc_error ("'%s' argument of '%s' intrinsic at %L must be a pointer " @@ -628,7 +628,7 @@ gfc_check_associated (gfc_expr *pointer, gfc_expr *target) return FAILURE; } - if (!attr.pointer && !attr.target) + if (attr1.pointer && !attr2.pointer && !attr2.target) { gfc_error ("'%s' argument of '%s' intrinsic at %L must be a POINTER " "or a TARGET", gfc_current_intrinsic_arg[1], @@ -2071,7 +2071,7 @@ gfc_check_null (gfc_expr *mold) attr = gfc_variable_attr (mold, NULL); - if (!attr.pointer) + if (!attr.pointer && !attr.proc_pointer) { gfc_error ("'%s' argument of '%s' intrinsic at %L must be a POINTER", gfc_current_intrinsic_arg[0], |