Merged in unstable/SW-17379-improve-functor-representation (pull request yuce#3)

SW-17379 Improve functor representation in lists

Approved-by: Guglielmo Gemignani <[email protected]>

Author: Omar Abdelwanis

pyswip/prolog.py

@@ -189,8 +189,8 @@ def query(cls, query, maxresult=-1, catcherrors=True, normalize=True):
 
 
 def normalize_values(values):
-    from pyswip.easy import Atom
-    if isinstance(values, Atom):
+    from pyswip.easy import Atom, Functor
+    if isinstance(values, (Atom, Functor)):
         return values.value
     elif isinstance(values, dict):
         return {key: normalize_values(v) for key, v in values.items()}

tests/test_prolog.py

@@ -80,6 +80,11 @@ def test_prolog_strings(self):
         p.assertz('some_string_fact("abc")')
         self.assertEqual([{"S": b"abc"}], list(p.query("some_string_fact(S)")))
 
+    def test_prolog_functor_in_list(self):
+        p = pl.Prolog()
+        p.assertz('f([g(a,b),h(a,b,c)])')
+        self.assertEqual([{"L": ['g(a, b)', 'h(a, b, c)']}], list(p.query("f(L)")))
+
     def test_prolog_read_file(self):
         """
         See: https://github.com/yuce/pyswip/issues/10