From 17b1d2a0498d7f5f56e626d3cdfa5e2627a0723e Mon Sep 17 00:00:00 2001 From: "Kaveh R. Ghazi" Date: Tue, 29 Jul 2008 00:45:52 +0000 Subject: gfortran.h (try): Remove macro. * gfortran.h (try): Remove macro. Replace try with gfc_try throughout. * array.c: Likewise. * check.c: Likewise. * cpp.c: Likewise. * cpp.h: Likewise. * data.c: Likewise. * data.h: Likewise. * decl.c: Likewise. * error.c: Likewise. * expr.c: Likewise. * interface.c: Likewise. * intrinsic.c: Likewise. * intrinsic.h: Likewise. * io.c: Likewise. * match.h: Likewise. * parse.c: Likewise. * parse.h: Likewise. * resolve.c: Likewise. * scanner.c: Likewise. * simplify.c: Likewise. * symbol.c: Likewise. * trans-openmp.c: Likewise. * trans-types.c: Likewise. From-SVN: r138226 --- gcc/fortran/decl.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'gcc/fortran/decl.c') diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 9b5aa7f..9b1e585 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -867,11 +867,11 @@ get_proc_name (const char *name, gfc_symbol **result, bool module_fcn_entry) the compiler could have automatically handled the varying sizes across platforms. */ -try +gfc_try verify_c_interop_param (gfc_symbol *sym) { int is_c_interop = 0; - try retval = SUCCESS; + gfc_try retval = SUCCESS; /* We check implicitly typed variables in symbol.c:gfc_set_default_type(). Don't repeat the checks here. */ @@ -1009,7 +1009,7 @@ verify_c_interop_param (gfc_symbol *sym) /* Function called by variable_decl() that adds a name to the symbol table. */ -static try +static gfc_try build_sym (const char *name, gfc_charlen *cl, gfc_array_spec **as, locus *var_locus) { @@ -1185,7 +1185,7 @@ gfc_free_enum_history (void) /* Function called by variable_decl() that adds an initialization expression to a symbol. */ -static try +static gfc_try add_init_expr_to_sym (const char *name, gfc_expr **initp, locus *var_locus) { symbol_attribute attr; @@ -1362,7 +1362,7 @@ add_init_expr_to_sym (const char *name, gfc_expr **initp, locus *var_locus) /* Function called by variable_decl() that adds a name to a structure being built. */ -static try +static gfc_try build_struct (const char *name, gfc_charlen *cl, gfc_expr **init, gfc_array_spec **as) { @@ -1548,7 +1548,7 @@ variable_decl (int elem) gfc_charlen *cl; locus var_locus; match m; - try t; + gfc_try t; gfc_symbol *sym; locus old_locus; @@ -2786,7 +2786,7 @@ match_attr_spec (void) decl_types d; const char *attr; match m; - try t; + gfc_try t; gfc_clear_attr (¤t_attr); start = gfc_current_locus; @@ -3248,7 +3248,7 @@ cleanup: (J3/04-007, section 15.4.1). If a binding label was given and there is more than one argument (num_idents), it is an error. */ -try +gfc_try set_binding_label (char *dest_label, const char *sym_name, int num_idents) { if (num_idents > 1 && has_name_equals) @@ -3288,10 +3288,10 @@ set_com_block_bind_c (gfc_common_head *com_block, int is_bind_c) /* Verify that the given gfc_typespec is for a C interoperable type. */ -try +gfc_try verify_c_interop (gfc_typespec *ts, const char *name, locus *where) { - try t; + gfc_try t; /* Make sure the kind used is appropriate for the type. The f90_type is unknown if an integer constant was @@ -3326,11 +3326,11 @@ verify_c_interop (gfc_typespec *ts, const char *name, locus *where) interoperable type. Errors will be reported here, if encountered. */ -try +gfc_try verify_com_block_vars_c_interop (gfc_common_head *com_block) { gfc_symbol *curr_sym = NULL; - try retval = SUCCESS; + gfc_try retval = SUCCESS; curr_sym = com_block->head; @@ -3354,11 +3354,11 @@ verify_com_block_vars_c_interop (gfc_common_head *com_block) /* Verify that a given BIND(C) symbol is C interoperable. If it is not, an appropriate error message is reported. */ -try +gfc_try verify_bind_c_sym (gfc_symbol *tmp_sym, gfc_typespec *ts, int is_in_common, gfc_common_head *com_block) { - try retval = SUCCESS; + gfc_try retval = SUCCESS; if (tmp_sym->attr.function && tmp_sym->result != NULL) { @@ -3478,10 +3478,10 @@ verify_bind_c_sym (gfc_symbol *tmp_sym, gfc_typespec *ts, the type is C interoperable. Errors are reported by the functions used to set/test these fields. */ -try +gfc_try set_verify_bind_c_sym (gfc_symbol *tmp_sym, int num_idents) { - try retval = SUCCESS; + gfc_try retval = SUCCESS; /* TODO: Do we need to make sure the vars aren't marked private? */ @@ -3499,10 +3499,10 @@ set_verify_bind_c_sym (gfc_symbol *tmp_sym, int num_idents) /* Set the fields marking the given common block as BIND(C), including a binding label, and report any errors encountered. */ -try +gfc_try set_verify_bind_c_com_block (gfc_common_head *com_block, int num_idents) { - try retval = SUCCESS; + gfc_try retval = SUCCESS; /* destLabel, common name, typespec (which may have binding label). */ if (set_binding_label (com_block->binding_label, com_block->name, num_idents) @@ -3519,7 +3519,7 @@ set_verify_bind_c_com_block (gfc_common_head *com_block, int num_idents) /* Retrieve the list of one or more identifiers that the given bind(c) attribute applies to. */ -try +gfc_try get_bind_c_idents (void) { char name[GFC_MAX_SYMBOL_LEN + 1]; @@ -3792,7 +3792,7 @@ loop: /* Copy attributes matched by gfc_match_prefix() to attributes on a symbol. */ -static try +static gfc_try copy_prefix (symbol_attribute *dest, locus *where) { if (current_attr.pure && gfc_add_pure (dest, where) == FAILURE) @@ -6400,7 +6400,7 @@ gfc_match_derived_decl (void) is the case. Since there is no bounds-checking for Cray Pointees, this will be okay. */ -try +gfc_try gfc_mod_pointee_as (gfc_array_spec *as) { as->cray_pointee = true; /* This will be useful to know later. */ @@ -6454,7 +6454,7 @@ enumerator_decl (void) gfc_symbol *sym; locus var_locus; match m; - try t; + gfc_try t; locus old_locus; initializer = NULL; @@ -6537,7 +6537,7 @@ match gfc_match_enumerator_def (void) { match m; - try t; + gfc_try t; gfc_clear_ts (¤t_ts); -- cgit v1.1