Commit 323c5722 by Andre Vehreschild

trans-expr.c (gfc_find_and_cut_at_last_class_ref): Fixed style.

gcc/fortran/ChangeLog:

2016-10-12  Andre Vehreschild  <vehre@gcc.gnu.org>

	* 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
parent 7daade99
2016-10-12 Andre Vehreschild <vehre@gcc.gnu.org>
* 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 <jakub@redhat.com> 2016-10-11 Jakub Jelinek <jakub@redhat.com>
* iresolve.c (is_trig_resolved, resolve_trig_call): Formatting fixes. * iresolve.c (is_trig_resolved, resolve_trig_call): Formatting fixes.
......
...@@ -357,8 +357,7 @@ gfc_find_and_cut_at_last_class_ref (gfc_expr *e) ...@@ -357,8 +357,7 @@ gfc_find_and_cut_at_last_class_ref (gfc_expr *e)
array_ref = NULL; array_ref = NULL;
for (ref = e->ref; ref; ref = ref->next) for (ref = e->ref; ref; ref = ref->next)
{ {
if (ref->type == REF_ARRAY if (ref->type == REF_ARRAY && ref->u.ar.type != AR_ELEMENT)
&& ref->u.ar.type != AR_ELEMENT)
array_ref = ref; array_ref = ref;
if (ref->type == REF_COMPONENT if (ref->type == REF_COMPONENT
...@@ -367,11 +366,10 @@ gfc_find_and_cut_at_last_class_ref (gfc_expr *e) ...@@ -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 /* Component to the right of a part reference with nonzero rank
must not have the ALLOCATABLE attribute. If attempts are must not have the ALLOCATABLE attribute. If attempts are
made to reference such a component reference, an error results made to reference such a component reference, an error results
followed by anICE. */ followed by an ICE. */
if (array_ref if (array_ref && CLASS_DATA (ref->u.c.component)->attr.allocatable)
&& CLASS_DATA (ref->u.c.component)->attr.allocatable)
return NULL; return NULL;
class_ref = ref; class_ref = ref;
} }
if (ref->next == NULL) if (ref->next == NULL)
...@@ -1428,7 +1426,7 @@ gfc_trans_class_init_assign (gfc_code *code) ...@@ -1428,7 +1426,7 @@ gfc_trans_class_init_assign (gfc_code *code)
rhs->rank = 0; rhs->rank = 0;
if (code->expr1->ts.type == BT_CLASS 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); tmp = gfc_trans_class_array_init_assign (rhs, lhs, code->expr1);
else else
{ {
...@@ -5880,7 +5878,7 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym, ...@@ -5880,7 +5878,7 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym,
if (comp) if (comp)
ts = comp->ts; ts = comp->ts;
else else
ts = sym->ts; ts = sym->ts;
if (ts.type == BT_CHARACTER && sym->attr.is_bind_c) if (ts.type == BT_CHARACTER && sym->attr.is_bind_c)
se->string_length = build_int_cst (gfc_charlen_type_node, 1); 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, ...@@ -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 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 a scalar to array assignment, this is done in gfc_trans_scalar_assign
as part of the deep copy. */ as part of the deep copy. */
if (!scalar_to_array && (expr1->ts.type == BT_DERIVED) if (!scalar_to_array && expr1->ts.type == BT_DERIVED
&& (gfc_is_alloc_class_array_function (expr2) && (gfc_is_alloc_class_array_function (expr2)
|| gfc_is_alloc_class_scalar_function (expr2))) || gfc_is_alloc_class_scalar_function (expr2)))
{ {
tmp = rse.expr; tmp = rse.expr;
tmp = gfc_nullify_alloc_comp (expr1->ts.u.derived, rse.expr, 0); tmp = gfc_nullify_alloc_comp (expr1->ts.u.derived, rse.expr, 0);
......
...@@ -5928,7 +5928,7 @@ gfc_trans_allocate (gfc_code * code) ...@@ -5928,7 +5928,7 @@ gfc_trans_allocate (gfc_code * code)
al_len_needs_set = false; al_len_needs_set = false;
} }
else if (expr->ts.type == BT_CHARACTER && al_len != NULL_TREE 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 /* Cover the cases where a string length is explicitly
specified by a type spec for deferred length character specified by a type spec for deferred length character
...@@ -6015,7 +6015,7 @@ gfc_trans_allocate (gfc_code * code) ...@@ -6015,7 +6015,7 @@ gfc_trans_allocate (gfc_code * code)
expr3_len = NULL_TREE; expr3_len = NULL_TREE;
} }
else if (code->ext.alloc.ts.type == BT_CHARACTER 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 /* Cover the cases where a string length is explicitly
specified by a type spec for deferred length character specified by a type spec for deferred length character
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment