From 323c57220b3ad1290afa0b377a6ad04de542516b Mon Sep 17 00:00:00 2001 From: Andre Vehreschild Date: Wed, 12 Oct 2016 18:39:01 +0200 Subject: [PATCH] trans-expr.c (gfc_find_and_cut_at_last_class_ref): Fixed style. gcc/fortran/ChangeLog: 2016-10-12 Andre Vehreschild * trans-expr.c (gfc_find_and_cut_at_last_class_ref): Fixed style. (gfc_trans_class_init_assign): Same. (gfc_conv_procedure_call): Same. (gfc_trans_assignment_1): Same. * trans-stmt.c (gfc_trans_allocate): Same. From-SVN: r241071 --- gcc/fortran/ChangeLog | 8 ++++++++ gcc/fortran/trans-expr.c | 20 +++++++++----------- gcc/fortran/trans-stmt.c | 4 ++-- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 5c801b66ed0..437e53b84bd 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,11 @@ +2016-10-12 Andre Vehreschild + + * trans-expr.c (gfc_find_and_cut_at_last_class_ref): Fixed style. + (gfc_trans_class_init_assign): Same. + (gfc_conv_procedure_call): Same. + (gfc_trans_assignment_1): Same. + * trans-stmt.c (gfc_trans_allocate): Same. + 2016-10-11 Jakub Jelinek * iresolve.c (is_trig_resolved, resolve_trig_call): Formatting fixes. diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 1de2818a6b2..655399b2ec9 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -357,8 +357,7 @@ gfc_find_and_cut_at_last_class_ref (gfc_expr *e) array_ref = NULL; for (ref = e->ref; ref; ref = ref->next) { - if (ref->type == REF_ARRAY - && ref->u.ar.type != AR_ELEMENT) + if (ref->type == REF_ARRAY && ref->u.ar.type != AR_ELEMENT) array_ref = ref; if (ref->type == REF_COMPONENT @@ -367,11 +366,10 @@ gfc_find_and_cut_at_last_class_ref (gfc_expr *e) /* Component to the right of a part reference with nonzero rank must not have the ALLOCATABLE attribute. If attempts are made to reference such a component reference, an error results - followed by anICE. */ - if (array_ref - && CLASS_DATA (ref->u.c.component)->attr.allocatable) + followed by an ICE. */ + if (array_ref && CLASS_DATA (ref->u.c.component)->attr.allocatable) return NULL; - class_ref = ref; + class_ref = ref; } if (ref->next == NULL) @@ -1428,7 +1426,7 @@ gfc_trans_class_init_assign (gfc_code *code) rhs->rank = 0; if (code->expr1->ts.type == BT_CLASS - && CLASS_DATA (code->expr1)->attr.dimension) + && CLASS_DATA (code->expr1)->attr.dimension) tmp = gfc_trans_class_array_init_assign (rhs, lhs, code->expr1); else { @@ -5880,7 +5878,7 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym, if (comp) ts = comp->ts; else - ts = sym->ts; + ts = sym->ts; if (ts.type == BT_CHARACTER && sym->attr.is_bind_c) se->string_length = build_int_cst (gfc_charlen_type_node, 1); @@ -9549,9 +9547,9 @@ gfc_trans_assignment_1 (gfc_expr * expr1, gfc_expr * expr2, bool init_flag, nullification occurs before the call to the finalizer. In the case of a scalar to array assignment, this is done in gfc_trans_scalar_assign as part of the deep copy. */ - if (!scalar_to_array && (expr1->ts.type == BT_DERIVED) - && (gfc_is_alloc_class_array_function (expr2) - || gfc_is_alloc_class_scalar_function (expr2))) + if (!scalar_to_array && expr1->ts.type == BT_DERIVED + && (gfc_is_alloc_class_array_function (expr2) + || gfc_is_alloc_class_scalar_function (expr2))) { tmp = rse.expr; tmp = gfc_nullify_alloc_comp (expr1->ts.u.derived, rse.expr, 0); diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c index 9fdacc10e39..67cd2b51f91 100644 --- a/gcc/fortran/trans-stmt.c +++ b/gcc/fortran/trans-stmt.c @@ -5928,7 +5928,7 @@ gfc_trans_allocate (gfc_code * code) al_len_needs_set = false; } else if (expr->ts.type == BT_CHARACTER && al_len != NULL_TREE - && code->ext.alloc.ts.u.cl->length) + && code->ext.alloc.ts.u.cl->length) { /* Cover the cases where a string length is explicitly specified by a type spec for deferred length character @@ -6015,7 +6015,7 @@ gfc_trans_allocate (gfc_code * code) expr3_len = NULL_TREE; } else if (code->ext.alloc.ts.type == BT_CHARACTER - && code->ext.alloc.ts.u.cl->length) + && code->ext.alloc.ts.u.cl->length) { /* Cover the cases where a string length is explicitly specified by a type spec for deferred length character -- 2.30.2