Hi Mikael,
On 5/5/23 13:43, Mikael Morin wrote:
Hello,
Le 01/05/2023 à 18:29, Harald Anlauf via Fortran a écrit :
+/* Given two expressions, check that their rank is conformable, i.e.
either
+ both have the same rank or at least one is a scalar. */
+
+bool
+gfc_op_rank_conformable (gfc_expr *op1, gfc_expr *op2)
+{
+// if (op1->expr_type == EXPR_VARIABLE && op1->ref)
Please remove this, and the other one below.
oops, that was a leftover from debugging sessions, which
I missed during my final pass. Fixed and pushed as
r14-529-g185da7c2014ba41f38dd62cc719873ebf020b076.
Thanks for the review!
Harald
+ if (op1->expr_type == EXPR_VARIABLE)
+ gfc_expression_rank (op1);
+// if (op2->expr_type == EXPR_VARIABLE && op2->ref)
+ if (op2->expr_type == EXPR_VARIABLE)
+ gfc_expression_rank (op2);
+
+ return (op1->rank == 0 || op2->rank == 0 || op1->rank == op2->rank);
+}
+
+
static void
add_caf_get_intrinsic (gfc_expr *e)
{
The rest looks good.
OK for master, and backport as well.
Thanks
Mikael
