X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gcc%2Ffortran%2Fdecl.c;h=b7b98d544b3650b0899861e0e3affed348886074;hb=7b901ac47fb235195a14d401567b0b2677ad8a03;hp=9fd54c56cc48ed34e721848c50ae563bfebaeade;hpb=a1ee985fa319b7a55e52ddd62f266e42ef9ae067;p=gcc.git diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 9fd54c56cc4..b7b98d544b3 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -231,21 +231,21 @@ syntax: variable-iterator list. */ static match -var_element (gfc_data_variable *new) +var_element (gfc_data_variable *new_var) { match m; gfc_symbol *sym; - memset (new, 0, sizeof (gfc_data_variable)); + memset (new_var, 0, sizeof (gfc_data_variable)); if (gfc_match_char ('(') == MATCH_YES) - return var_list (new); + return var_list (new_var); - m = gfc_match_variable (&new->expr, 0); + m = gfc_match_variable (&new_var->expr, 0); if (m != MATCH_YES) return m; - sym = new->expr->symtree->n.sym; + sym = new_var->expr->symtree->n.sym; if (!sym->attr.function && gfc_current_ns->parent && gfc_current_ns->parent == sym->ns) @@ -262,7 +262,7 @@ var_element (gfc_data_variable *new) sym->name) == FAILURE) return MATCH_ERROR; - if (gfc_add_data (&sym->attr, sym->name, &new->expr->where) == FAILURE) + if (gfc_add_data (&sym->attr, sym->name, &new_var->expr->where) == FAILURE) return MATCH_ERROR; return MATCH_YES; @@ -274,7 +274,7 @@ var_element (gfc_data_variable *new) static match top_var_list (gfc_data *d) { - gfc_data_variable var, *tail, *new; + gfc_data_variable var, *tail, *new_var; match m; tail = NULL; @@ -287,15 +287,15 @@ top_var_list (gfc_data *d) if (m == MATCH_ERROR) return MATCH_ERROR; - new = gfc_get_data_variable (); - *new = var; + new_var = gfc_get_data_variable (); + *new_var = var; if (tail == NULL) - d->var = new; + d->var = new_var; else - tail->next = new; + tail->next = new_var; - tail = new; + tail = new_var; if (gfc_match_char ('/') == MATCH_YES) break; @@ -404,7 +404,7 @@ match_data_constant (gfc_expr **result) static match top_val_list (gfc_data *data) { - gfc_data_value *new, *tail; + gfc_data_value *new_val, *tail; gfc_expr *expr; match m; @@ -418,15 +418,15 @@ top_val_list (gfc_data *data) if (m == MATCH_ERROR) return MATCH_ERROR; - new = gfc_get_data_value (); - mpz_init (new->repeat); + new_val = gfc_get_data_value (); + mpz_init (new_val->repeat); if (tail == NULL) - data->value = new; + data->value = new_val; else - tail->next = new; + tail->next = new_val; - tail = new; + tail = new_val; if (expr->ts.type != BT_INTEGER || gfc_match_char ('*') != MATCH_YES) { @@ -518,26 +518,26 @@ match_old_style_init (const char *name) match gfc_match_data (void) { - gfc_data *new; + gfc_data *new_data; match m; set_in_match_data (true); for (;;) { - new = gfc_get_data (); - new->where = gfc_current_locus; + new_data = gfc_get_data (); + new_data->where = gfc_current_locus; - m = top_var_list (new); + m = top_var_list (new_data); if (m != MATCH_YES) goto cleanup; - m = top_val_list (new); + m = top_val_list (new_data); if (m != MATCH_YES) goto cleanup; - new->next = gfc_current_ns->data; - gfc_current_ns->data = new; + new_data->next = gfc_current_ns->data; + gfc_current_ns->data = new_data; if (gfc_match_eos () == MATCH_YES) break; @@ -557,7 +557,7 @@ gfc_match_data (void) cleanup: set_in_match_data (false); - gfc_free_data (new); + gfc_free_data (new_data); return MATCH_ERROR; } @@ -781,7 +781,7 @@ get_proc_name (const char *name, gfc_symbol **result, bool module_fcn_entry) sym = *result; gfc_current_ns->refs++; - if (sym && !sym->new && gfc_current_state () != COMP_INTERFACE) + if (sym && !sym->gfc_new && gfc_current_state () != COMP_INTERFACE) { /* Trap another encompassed procedure with the same name. All these conditions are necessary to avoid picking up an entry