diff options
author | Daniel Kraft <d@domob.eu> | 2008-08-28 20:03:02 +0200 |
---|---|---|
committer | Daniel Kraft <domob@gcc.gnu.org> | 2008-08-28 20:03:02 +0200 |
commit | 8e1f752a2627ad49b06825cb95d6a3520512f210 (patch) | |
tree | 40d33bd2a0404b05dfa1fbd4df6b97a4e144ac98 /gcc/fortran/expr.c | |
parent | cf7442bb5f155d6e7a1de5fe7922e7831ebefade (diff) | |
download | gcc-8e1f752a2627ad49b06825cb95d6a3520512f210.zip gcc-8e1f752a2627ad49b06825cb95d6a3520512f210.tar.gz gcc-8e1f752a2627ad49b06825cb95d6a3520512f210.tar.bz2 |
gfortran.h (enum expr_t): New value `EXPR_COMPCALL'.
2008-08-28 Daniel Kraft <d@domob.eu>
* gfortran.h (enum expr_t): New value `EXPR_COMPCALL'.
(gfc_get_typebound_proc): New macro.
(struct gfc_expr): New union-member `compcall' for EXPR_COMPCALL.
(enum gfc_exec_op): New value `EXEC_COMPCALL'.
(gfc_find_typebound_proc): New argument.
(gfc_copy_ref), (gfc_match_varspec): Made public.
* decl.c (match_procedure_in_type): Use gfc_get_typebound_proc.
* expr.c (free_expr0), (gfc_copy_expr): Handle EXPR_COMPCALL.
(gfc_copy_ref): Made public and use new name.
(simplify_const_ref): Use new name of gfc_copy_ref.
(simplify_parameter_variable): Ditto.
(gfc_simplify_expr): gcc_unreachable for EXPR_COMPCALL.
* match.c (match_typebound_call): New method.
(gfc_match_call): Allow for CALL's to typebound procedures.
* module.c (binding_passing), (binding_overriding): New variables.
(expr_types): Add EXPR_COMPCALL.
(mio_expr): gcc_unreachable for EXPR_COMPCALL.
(mio_typebound_proc), (mio_typebound_symtree): New methods.
(mio_f2k_derived): Handle type-bound procedures.
* primary.c (gfc_match_varspec): Made public and parse trailing
references to type-bound procedures; new argument `sub_flag'.
(gfc_match_rvalue): New name and argument of gfc_match_varspec.
(match_variable): Ditto.
* resolve.c (update_arglist_pass): New method.
(update_compcall_arglist), (resolve_typebound_static): New methods.
(resolve_typebound_call), (resolve_compcall): New methods.
(gfc_resolve_expr): Handle EXPR_COMPCALL.
(resolve_code): Handle EXEC_COMPCALL.
(resolve_fl_derived): New argument to gfc_find_typebound_proc.
(resolve_typebound_procedure): Ditto and removed not-implemented error.
* st.c (gfc_free_statement): Handle EXEC_COMPCALL.
* symbol.c (gfc_find_typebound_proc): New argument `noaccess' and
implement access-checking.
* trans-expr.c (gfc_apply_interface_mapping_to_expr): gcc_unreachable
on EXPR_COMPCALL.
* trans-intrinsic.c (gfc_conv_intrinsic_bound): Add missing break.
* trans-openmp.c (gfc_trans_omp_array_reduction): Add missing
intialization of ref->type.
2008-08-28 Daniel Kraft <d@domob.eu>
* gfortran.dg/typebound_call_1.f03: New test.
* gfortran.dg/typebound_call_2.f03: New test.
* gfortran.dg/typebound_call_3.f03: New test.
* gfortran.dg/typebound_call_4.f03: New test.
* gfortran.dg/typebound_call_5.f03: New test.
* gfortran.dg/typebound_call_6.f03: New test.
* gfortran.dg/typebound_proc_1.f08: Don't expect not-implemented error.
* gfortran.dg/typebound_proc_2.f90: Ditto.
* gfortran.dg/typebound_proc_5.f03: Ditto.
* gfortran.dg/typebound_proc_6.f03: Ditto.
* gfortran.dg/typebound_proc_7.f03: Ditto.
* gfortran.dg/typebound_proc_8.f03: Ditto.
From-SVN: r139724
Diffstat (limited to 'gcc/fortran/expr.c')
-rw-r--r-- | gcc/fortran/expr.c | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 2975975..b5a17c0 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -181,6 +181,10 @@ free_expr0 (gfc_expr *e) gfc_free_actual_arglist (e->value.function.actual); break; + case EXPR_COMPCALL: + gfc_free_actual_arglist (e->value.compcall.actual); + break; + case EXPR_VARIABLE: break; @@ -268,8 +272,8 @@ gfc_extract_int (gfc_expr *expr, int *result) /* Recursively copy a list of reference structures. */ -static gfc_ref * -copy_ref (gfc_ref *src) +gfc_ref * +gfc_copy_ref (gfc_ref *src) { gfc_array_ref *ar; gfc_ref *dest; @@ -299,7 +303,7 @@ copy_ref (gfc_ref *src) break; } - dest->next = copy_ref (src->next); + dest->next = gfc_copy_ref (src->next); return dest; } @@ -502,6 +506,12 @@ gfc_copy_expr (gfc_expr *p) gfc_copy_actual_arglist (p->value.function.actual); break; + case EXPR_COMPCALL: + q->value.compcall.actual = + gfc_copy_actual_arglist (p->value.compcall.actual); + q->value.compcall.tbp = p->value.compcall.tbp; + break; + case EXPR_STRUCTURE: case EXPR_ARRAY: q->value.constructor = gfc_copy_constructor (p->value.constructor); @@ -514,7 +524,7 @@ gfc_copy_expr (gfc_expr *p) q->shape = gfc_copy_shape (p->shape, p->rank); - q->ref = copy_ref (p->ref); + q->ref = gfc_copy_ref (p->ref); return q; } @@ -1443,7 +1453,7 @@ simplify_const_ref (gfc_expr *p) cons = p->value.constructor; for (; cons; cons = cons->next) { - cons->expr->ref = copy_ref (p->ref->next); + cons->expr->ref = gfc_copy_ref (p->ref->next); simplify_const_ref (cons->expr); } } @@ -1531,7 +1541,7 @@ simplify_parameter_variable (gfc_expr *p, int type) /* Do not copy subobject refs for constant. */ if (e->expr_type != EXPR_CONSTANT && p->ref != NULL) - e->ref = copy_ref (p->ref); + e->ref = gfc_copy_ref (p->ref); t = gfc_simplify_expr (e, type); /* Only use the simplification if it eliminated all subobject references. */ @@ -1670,6 +1680,10 @@ gfc_simplify_expr (gfc_expr *p, int type) return FAILURE; break; + + case EXPR_COMPCALL: + gcc_unreachable (); + break; } return SUCCESS; |