#3124 Improve tests and TODOs

Author: sergisiso

src/psyclone/domain/common/transformations/raise_psyir_2_alg_trans.py

@@ -174,6 +174,7 @@ def apply(self, node: Call, index: int = None, options=None, **kwargs):
             arg_info = []
             if node.argument_names[idx]:
                 call_name = f"{call_arg.value}"
+                continue
             else:
                 # Get the symbols and args to reconstruct it as a
                 # higher-abstraction AlgorithmInvokeCall node

src/psyclone/psyir/backend/fortran.py

@@ -1076,15 +1076,19 @@ def filecontainer_node(self, node):
         :rtype: str
 
         :raises VisitorError: if the attached symbol table contains
-            any non-routine symbols.
+            any symbols that can not be declard in a FileContainer.
         :raises VisitorError: if more than one child is a Routine Node
             with is_program set to True.
 
         '''
         for symbol in node.symbol_table.symbols:
-            # TODO #2201 - ContainerSymbols should be accepted but
-            # currently are stored in its containing scope.
-            if isinstance(symbol, DataSymbol):
+            # Only RoutineSymbols and ContainerSymbol can be declared here
+            # pylint: disable=unidiomatic-typecheck
+            if type(symbol) is Symbol and symbol.is_unresolved:
+                # However we also accept symbols that we don't know where
+                # they are declared, so we propagated upwards.
+                continue
+            if not isinstance(symbol, (RoutineSymbol, ContainerSymbol)):
                 raise VisitorError(
                     f"In the Fortran backend, a file container should not "
                     f"have any data symbols associated with it, "

src/psyclone/tests/psyir/frontend/fparser2_subroutine_handler_test.py

@@ -607,5 +607,5 @@ def test_module_contains_subroutine_contains_subroutine(
     # propagating it are.
 
     if "s" in psyir.children[0].symbol_table:
-        pytest.xfail("TODO #3361: When support for Routines inside Routines"
+        pytest.xfail("TODO #2205: When support for Routines inside Routines"
                      " is added, the symbol will not be propagated")

src/psyclone/tests/psyir/frontend/fparser2_where_handler_test.py

@@ -1257,57 +1257,6 @@ def test_nested_where(fortran_reader, fortran_writer, tmp_path):
             " 'UnresolvedType'. Consider adding the name of the file "
             "containing the declaration of this quantity to RESOLVE_IMPORTS.")
 
-    # If some information is provided, one of the WHEREs can be resolved, but
-    # the other still is a CodeBlock
-    code = ("module my_mod\n"
-            "  use some_mod\n"
-            "contains\n"
-            "subroutine my_sub()\n"
-            "  type :: mytype\n"
-            "    real, dimension(10,10,10) :: D11\n"
-            "    real, dimension(10,10,10) :: D12\n"
-            "    real, dimension(10,10,10) :: D22\n"
-            "  end type\n"
-            "  type(mytype) :: p_dal\n"
-            "  WHERE ( z_lenp4(:,:) <= 0.0_wp )\n"
-            "    p_dal%D12(:,:,1) = 0.0_wp\n"
-            "    z_lenp2(:,:) = SQRT( p_dal%D11(:,:,1) * p_dal%D22(:,:,1) )\n"
-            "    WHERE ( z_lenp2(:,:) == 0.0_wp )\n"
-            "      p_dal%D11(:,:,1) = p_ens%D11_min(:,:)\n"
-            "      p_dal%D22(:,:,1) = p_ens%D22_min(:,:)\n"
-            "      z_lenp2(:,:) = z_lenp2_min(:,:)\n"
-            "    END WHERE\n"
-            "  END WHERE\n"
-            "end subroutine my_sub\n"
-            "end module my_mod\n")
-    psyir = fortran_reader.psyir_from_source(code)
-    code = fortran_writer(psyir)
-    # FIXME
-    return
-    assert """
-    do widx2 = 1, SIZE(z_lenp4, dim=2), 1
-      do widx1 = 1, SIZE(z_lenp4, dim=1), 1
-        if (z_lenp4(LBOUND(z_lenp4, dim=1) + widx1 - 1,LBOUND(z_lenp4, dim=2) \
-+ widx2 - 1) <= 0.0_wp) then
-          p_dal%D12(widx1,widx2,1) = 0.0_wp
-          z_lenp2(LBOUND(z_lenp2, dim=1) + widx1 - 1,LBOUND(z_lenp2, dim=2) + \
-widx2 - 1) = SQRT(p_dal%D11(widx1,widx2,1) * p_dal%D22(widx1,widx2,1))
-
-          ! PSyclone CodeBlock (unsupported code) reason:
-          !  - WHERE not supported because 'p_ens' cannot be converted to an \
-array due to: Transformation Error: The supplied node should be a Reference \
-to a symbol of known type, but 'p_ens%D11_min(:,:)' is 'UnresolvedType'. \
-Consider adding the name of the file containing the declaration of this \
-quantity to RESOLVE_IMPORTS.
-          WHERE (z_lenp2(:, :) == 0.0_wp)
-            p_dal % D11(:, :, 1) = p_ens % D11_min(:, :)
-            p_dal % D22(:, :, 1) = p_ens % D22_min(:, :)
-            z_lenp2(:, :) = z_lenp2_min(:, :)
-          END WHERE
-        end if
-      enddo
-    enddo""" == code
-
     # If enough information is provided, both WHEREs are resolved and nested
     code = ("module my_mod\n"
             "contains\n"