#2923 Added Hugo's example.

Author: hiker

src/psyclone/tests/core/symbolic_maths_test.py

@@ -514,23 +514,26 @@ def test_symbolic_maths_array_and_array_index(fortran_reader):
                            psyir.children[0][1].rhs)
 
 
-@pytest.mark.parametrize("expressions", [(".false. .and. .false.", "False"),
-                                         (".false. .and. .true.", "False"),
-                                         (".true. .and. .false.", "False"),
-                                         (".true. .and. .true.", "True"),
-                                         (".false. .or. .false.", "False"),
-                                         (".false. .or. .true.", "True"),
-                                         (".true. .or. .false.", "True"),
-                                         (".true. .or. .true.", "True"),
-                                         (".false. .eqv. .false.", "True"),
-                                         (".false. .eqv. .true.", "False"),
-                                         (".true. .eqv. .false.", "False"),
-                                         (".true. .eqv. .true.", "True"),
-                                         (".false. .neqv. .false.", "False"),
-                                         (".false. .neqv. .true.", "True"),
-                                         (".true. .neqv. .false.", "True"),
-                                         (".true. .neqv. .true.", "False"),
-                                         ])
+@pytest.mark.parametrize(
+    "expressions",
+    [(".false. .and. .false.", "False"),
+     (".false. .and. .true.", "False"),
+     (".true. .and. .false.", "False"),
+     (".true. .and. .true.", "True"),
+     (".false. .or. .false.", "False"),
+     (".false. .or. .true.", "True"),
+     (".true. .or. .false.", "True"),
+     (".true. .or. .true.", "True"),
+     (".false. .eqv. .false.", "True"),
+     (".false. .eqv. .true.", "False"),
+     (".true. .eqv. .false.", "False"),
+     (".true. .eqv. .true.", "True"),
+     (".false. .neqv. .false.", "False"),
+     (".false. .neqv. .true.", "True"),
+     (".true. .neqv. .false.", "True"),
+     (".true. .neqv. .true.", "False"),
+     (" .false. .and. ((3 -2 + 4 - 5) .eq. 0 .and. .false.)", False),
+     ])
 def test_sym_writer_boolean_expr(fortran_reader, expressions):
     '''Test that booleans are written in the way that SymPy accepts.
     '''
@@ -549,3 +552,34 @@ def test_sym_writer_boolean_expr(fortran_reader, expressions):
 
     sympy_expr = sympy_writer(lit0)
     assert sympy_expr == sympy_writer(lit1)
+
+
+@pytest.mark.parametrize(
+    "expressions",
+    [(".true. .and. .false.", False),
+     (".true. .and. .true.", True),
+     (".false. .or. .true.", True),
+     ("3 .eq. 3", True),
+     (" ((3 -2 + 4 - 5) .eq. 0 .and. .false.) .or. .true.", True),
+     (" ((3 -2 + 4 - 5) .eq. 0 .and. .true.)", True),
+     (" (3 -2 + 4 - 5) .eq. 0 .and. .false. .and. .true.", False),
+     (" ((3 -2 + 4 - 5) .eq. 0 .and. .false.) .and. .true.", False),
+     (" .false. .and. ((3 -2 + 4 - 5) .eq. 0 .and. .false.)", False),
+     ("  (((3 -2 + 4 - 5) .eq. 0) .and. .false.)", False),
+     ])
+def test_sym_writer_boolean_expr_add_test(fortran_reader, expressions):
+    '''Test that booleans are written in the way that SymPy accepts.
+    '''
+    # A dummy program to easily create the PSyIR for the
+    # expressions we need. We just take the RHS of the assignments
+    source = f'''program test_prog
+    logical :: bool_expr
+    bool_expr = {expressions[0]}
+    end program test_prog '''
+
+    psyir = fortran_reader.psyir_from_source(source)
+    lit = psyir.children[0].children[0].rhs
+    sympy_writer = SymPyWriter()
+    sympy_expr = sympy_writer(lit)
+    print("XX", sympy_expr)
+    assert sympy_expr == expressions[1]