Merge pull request #10 from brandonwillard/updates-for-stream-unification

Update unification extension for stream-processing

Author: brandonwillard

cons/core.py

@@ -122,7 +122,7 @@ def cons_merge(cls, car_part, cdr_part):
         return chain((car_part,), cdr_part)
 
     def __hash__(self):
-        return hash([self.car, self.cdr])
+        return hash((self.car, self.cdr))
 
     def __eq__(self, other):
         return (

cons/unify.py

@@ -1,13 +1,16 @@
 from itertools import tee
-from collections import OrderedDict
 from collections.abc import Iterator, Mapping
 
-from unification.core import unify, _unify, reify, _reify
+from unification.core import (
+    _unify,
+    _reify,
+    construction_sentinel,
+)
 
 from .core import car, cdr, ConsPair, cons, MaybeCons, ConsError
 
 
-def _cons_unify(lcons, rcons, s):
+def _unify_Cons(lcons, rcons, s):
 
     lcons_ = lcons
     rcons_ = rcons
@@ -19,27 +22,23 @@ def _cons_unify(lcons, rcons, s):
         rcons, rcons_ = tee(rcons)
 
     try:
-        s = unify(car(lcons), car(rcons), s)
+        s = yield _unify(car(lcons), car(rcons), s)
 
         if s is not False:
-            return unify(cdr(lcons_), cdr(rcons_), s)
+            s = yield _unify(cdr(lcons_), cdr(rcons_), s)
     except ConsError:
-        pass
+        yield False
+    else:
+        yield s
 
-    return False
 
-
-_unify.add((ConsPair, (ConsPair, MaybeCons), Mapping), _cons_unify)
-_unify.add((MaybeCons, ConsPair, Mapping), _cons_unify)
-
-
-@_reify.register(OrderedDict, Mapping)
-def reify_OrderedDict(od, s):
-    return OrderedDict((k, reify(v, s)) for k, v in od.items())
+_unify.add((ConsPair, (ConsPair, MaybeCons), Mapping), _unify_Cons)
+_unify.add((MaybeCons, ConsPair, Mapping), _unify_Cons)
 
 
 @_reify.register(ConsPair, Mapping)
-def reify_cons(lcons, s):
-    rcar = reify(car(lcons), s)
-    rcdr = reify(cdr(lcons), s)
-    return cons(rcar, rcdr)
+def _reify_Cons(lcons, s):
+    rcar = yield _reify(car(lcons), s)
+    rcdr = yield _reify(cdr(lcons), s)
+    yield construction_sentinel
+    yield cons(rcar, rcdr)

setup.py

@@ -9,7 +9,7 @@
     name="cons",
     version=versioneer.get_version(),
     cmdclass=versioneer.get_cmdclass(),
-    install_requires=["logical-unification"],
+    install_requires=["logical-unification>=0.4.0"],
     packages=find_packages(exclude=["tests"]),
     tests_require=["pytest"],
     author="Brandon T. Willard",

tests/test_cons.py

@@ -1,6 +1,5 @@
 import pytest
 
-from functools import reduce
 from itertools import chain, cycle
 from collections import OrderedDict, UserList
 from collections.abc import Iterator
@@ -11,14 +10,6 @@
 from cons.core import ConsPair, MaybeCons, ConsNull, ConsError, NonCons
 
 
-def assert_all_equal(*tests):
-    def _equal(x, y):
-        assert x, y
-        return y
-
-    reduce(_equal, tests)
-
-
 def test_noncons_type():
 
     with pytest.raises(TypeError):
@@ -83,8 +74,7 @@ def test_cons_join():
         cons("a")
 
     assert cons(1, 2, 3, 4) == cons(1, cons(2, cons(3, 4)))
-
-    assert_all_equal(cons("a", None), cons("a", []), ["a"])
+    assert cons("a", None) == cons("a", []) == ["a"]
     assert cons("a", ()) == ("a",)
     assert cons("a", []) == ["a"]
     assert cons(None, "a").car is None
@@ -124,7 +114,9 @@ def __add__(self, a):
     assert cons(1, CustomList([2, 3])) is clist_res
 
 
-def test_cons_str():
+def test_cons_class():
+    c = cons(1, 2)
+    assert {c: 1}[c] == 1
     assert repr(cons(1, 2)) == "ConsPair(1, 2)"
     assert str(cons(1, 2, 3)) == "(1 . (2 . 3))"
 
@@ -257,6 +249,10 @@ def test_unification():
     assert res[car_lv] == 1
     assert list(res[cdr_lv]) == []
 
+    res = unify(cons(car_lv, cdr_lv), iter([1]), {})
+    assert res[car_lv] == 1
+    assert list(res[cdr_lv]) == []
+
     res = unify(OrderedDict([("a", 1), ("b", 2)]), cons(car_lv, cdr_lv), {})
     assert res[car_lv] == ("a", 1)
     assert res[cdr_lv] == [("b", 2)]