diff options
| author | Tobias Schlüter <tobi@gcc.gnu.org> | 2004-06-04 00:35:41 +0200 |
|---|---|---|
| committer | Tobias Schlüter <tobi@gcc.gnu.org> | 2004-06-04 00:35:41 +0200 |
| commit | 1600fe22b9c077d311efd4c677b80d2fa0efb17e (patch) | |
| tree | 1c845ff438eb6e41b7432a288e671baf85346e7a /gcc/fortran | |
| parent | ed5947c9bcae4c500c8e96f2809b4df527234804 (diff) | |
| download | gcc-1600fe22b9c077d311efd4c677b80d2fa0efb17e.zip gcc-1600fe22b9c077d311efd4c677b80d2fa0efb17e.tar.gz gcc-1600fe22b9c077d311efd4c677b80d2fa0efb17e.tar.bz2 | |
gfortran.h (gfc_actual_arglist): New field missing_arg_type.
fortran/
* gfortran.h (gfc_actual_arglist): New field missing_arg_type.
* interface.c (compare_actual_formal): Keep type of omitted
optional arguments.
* trans-expr.c (gfc_conv_function_call): Add string length
argument for omitted string argument.
testsuite/
* gfortran.fortran-torture/execute/optstring_1.f90: New testcase.
From-SVN: r82608
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/fortran/gfortran.h | 5 | ||||
| -rw-r--r-- | gcc/fortran/interface.c | 11 | ||||
| -rw-r--r-- | gcc/fortran/trans-expr.c | 2 |
4 files changed, 24 insertions, 4 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 3cb938c..75168d8 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,4 +1,12 @@ -2004-05-03 Paul Brook <paul@codesourcery.com> +2004-06-03 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> + + * gfortran.h (gfc_actual_arglist): New field missing_arg_type. + * interface.c (compare_actual_formal): Keep type of omitted + optional arguments. + * trans-expr.c (gfc_conv_function_call): Add string length + argument for omitted string argument. + +2004-06-03 Paul Brook <paul@codesourcery.com> * trans.c (gfc_finish_block, gfc_add_expr_to_block): Build statement lists instead of compound expr chains. diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h index 74596f4..c82483e 100644 --- a/gcc/fortran/gfortran.h +++ b/gcc/fortran/gfortran.h @@ -538,6 +538,11 @@ typedef struct gfc_actual_arglist /* Alternate return label when the expr member is null. */ struct gfc_st_label *label; + /* This is set to the type of an eventual omitted optional + argument. This is used to determine if a hidden string length + argument has to be added to a function call. */ + bt missing_arg_type; + struct gfc_expr *expr; struct gfc_actual_arglist *next; } diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index a3c3acc..30706d4 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -1096,7 +1096,8 @@ compare_parameter (gfc_symbol * formal, gfc_expr * actual, return compare_interfaces (formal, actual->symtree->n.sym, 0); } - if (!gfc_compare_types (&formal->ts, &actual->ts)) + if (actual->expr_type != EXPR_NULL + && !gfc_compare_types (&formal->ts, &actual->ts)) return 0; if (symbol_rank (formal) == actual->rank) @@ -1235,7 +1236,8 @@ compare_actual_formal (gfc_actual_arglist ** ap, return 0; } - if (compare_pointer (f->sym, a->expr) == 0) + if (a->expr->expr_type != EXPR_NULL + && compare_pointer (f->sym, a->expr) == 0) { if (where) gfc_error ("Actual argument for '%s' must be a pointer at %L", @@ -1291,6 +1293,11 @@ compare_actual_formal (gfc_actual_arglist ** ap, if (*ap == NULL && n > 0) *ap = new[0]; + /* Note the types of omitted optional arguments. */ + for (a = actual, f = formal; a; a = a->next, f = f->next) + if (a->expr == NULL && a->label == NULL) + a->missing_arg_type = f->sym->ts.type; + return 1; } diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index a1a8d46..dda08bb 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -1077,7 +1077,7 @@ gfc_conv_function_call (gfc_se * se, gfc_symbol * sym, /* Pass a NULL pointer for an absent arg. */ gfc_init_se (&parmse, NULL); parmse.expr = null_pointer_node; - if (formal && formal->sym->ts.type == BT_CHARACTER) + if (arg->missing_arg_type == BT_CHARACTER) { stringargs = gfc_chainon_list (stringargs, convert (gfc_strlen_type_node, integer_zero_node)); |