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>
* 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)
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,9 +366,8 @@ 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;
}
......@@ -9549,7 +9547,7 @@ 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)
if (!scalar_to_array && expr1->ts.type == BT_DERIVED
&& (gfc_is_alloc_class_array_function (expr2)
|| gfc_is_alloc_class_scalar_function (expr2)))
{
......
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