Merge pull request #284 from ecmwf-ifs/naml-fix-masked-transformer-in…

…place

MaskedTransformer: Fix in-place rebuilding of scoped nodes

loki/ir/transformer.py

@@ -485,7 +485,7 @@ def visit_ScopedNode(self, o, **kwargs):
 
         # Update rebuilt node
         if kwargs['parent_active']:
-            o._update(rebuilt)
+            o._update(*rebuilt)
             return o
         return tuple(i for i in rebuilt if i is not None) or None
 

tests/test_visitor.py

@@ -979,6 +979,14 @@ def test_masked_transformer_associates(frontend):
     assert len(FindNodes(Assignment).visit(body)) == 3
     assert not FindNodes(Associate).visit(body)
 
+    # Retains all nodes but the last, but check with ``inplace=True``
+    body = MaskedTransformer(start=None, stop=assignments[-1], active=True, inplace=True).visit(routine.body)
+    assert len(FindNodes(Assignment).visit(body)) == len(assignments) - 1
+    assocs = FindNodes(Associate).visit(body)
+    assert len(assocs) == 1
+    assert len(assocs[0].body) == len(assignments) - 1
+    assert all(isinstance(n, Assignment) for n in assocs[0].body)
+
 
 @pytest.mark.parametrize('frontend', available_frontends())
 def test_nested_masked_transformer(frontend):