make compose infix

Author: czheo

syntax_sugar/__init__.py

@@ -5,4 +5,3 @@
 from .stream import *
 from .placeholder import *
 from .match import *
-from eventlet import green

syntax_sugar/composable.py

@@ -1,10 +1,12 @@
 from functools import partial
 from functools import reduce
+from .infix import infix
 
 
 __all__ = [
     'composable',
     'compose',
+    'o',
 ]
 
 class composable(partial):
@@ -14,7 +16,10 @@ def __mul__(self, rhs):
     def __rmul__(self, lhs):
         return lambda *args, **kwargs: lhs(self(*args, **kwargs))
 
+@infix
 def compose(*args):
     return reduce(lambda acc, fn:
         (lambda *ag, **kwag: acc(fn(*ag, **kwag))),
     args)
+
+o = compose

syntax_sugar/infix.py

@@ -1,52 +1,12 @@
 from functools import partial
-from .iter import Iterator, Range
 
 __all__ = [
     'infix',
-    'is_a',
-    'as_a',
-    'to',
-    'step',
-    'INF',
-    'NEGINF',
-    'has',
-    'take',
-    'drop',
 ]
 
-INF = float('inf')
-NEGINF = float('-inf')
-
 class infix(partial):
     def __truediv__(self, right):
         return self(right)
 
     def __rtruediv__(self, left):
         return infix(self.func, left)
-
-is_a = infix(isinstance)
-has = infix(hasattr)
-
-@infix
-def as_a(obj, clazz):
-    return clazz(obj)
-
-@infix
-def to(start, end):
-    return Iterator(Range(start, end))
-
-@infix
-def step(obj, step):
-    step = abs(step)
-    obj = Iterator(obj) if not obj /is_a/ Iterator else obj
-    return obj.slice(step=step)
-
-@infix
-def take(obj, n):
-    obj = Iterator(obj) if not obj /is_a/ Iterator else obj
-    return obj.slice(stop=n)
-
-@infix
-def drop(obj, n):
-    obj = Iterator(obj) if not obj /is_a/ Iterator else obj
-    return obj.slice(start=n)

syntax_sugar/util.py

@@ -1,8 +1,48 @@
+from .infix import infix
+from .iter import Iterator, Range
+
+__all__ = [
+    'flip',
+    'is_a',
+    'as_a',
+    'to',
+    'step',
+    'INF',
+    'has',
+    'take',
+    'drop',
+]
+
+INF = float('inf')
+
 def flip(fn):
     def wrapper(*args):
         return fn(args[1], args[0])
     return wrapper
 
-__all__ = [
-    'flip',
-]
+is_a = infix(isinstance)
+has = infix(hasattr)
+
+@infix
+def as_a(obj, clazz):
+    return clazz(obj)
+
+@infix
+def to(start, end):
+    return Iterator(Range(start, end))
+
+@infix
+def step(obj, step):
+    step = abs(step)
+    obj = Iterator(obj) if not obj /is_a/ Iterator else obj
+    return obj.slice(step=step)
+
+@infix
+def take(obj, n):
+    obj = Iterator(obj) if not obj /is_a/ Iterator else obj
+    return obj.slice(stop=n)
+
+@infix
+def drop(obj, n):
+    obj = Iterator(obj) if not obj /is_a/ Iterator else obj
+    return obj.slice(start=n)

tests/test_infix.py

@@ -62,16 +62,16 @@ def test_infinity():
         INF /to/ 100
 
     with raises(ValueError):
-        NEGINF /to/ 1
+        -INF /to/ 1
 
     _assert_iter(1 /to/ INF /take/ 10, range(1, 11))
-    _assert_iter(1 /to/ NEGINF /take/ 10, range(1, -9, -1))
+    _assert_iter(1 /to/ -INF /take/ 10, range(1, -9, -1))
 
     _assert_iter(1 /to/ INF /step/ 2 /take/ 10, list(range(1, 100, 2))[:10])
-    _assert_iter(1 /to/ NEGINF /step/ 2 /take/ 10, list(range(1, -100, -2))[:10])
+    _assert_iter(1 /to/ -INF /step/ 2 /take/ 10, list(range(1, -100, -2))[:10])
 
-    _assert_iter(1 /to/ NEGINF /step/ 2 /take/ 10 /drop/ 2, list(range(1, -100, -2))[2:10])
-    _assert_iter(1 /to/ NEGINF /step/ 2 /drop/ 5 /take/ 3, [-9, -11, -13])
+    _assert_iter(1 /to/ -INF /step/ 2 /take/ 10 /drop/ 2, list(range(1, -100, -2))[2:10])
+    _assert_iter(1 /to/ -INF /step/ 2 /drop/ 5 /take/ 3, [-9, -11, -13])
 
 
 def test_take():

tests/test_iter.py

@@ -1,6 +1,6 @@
 from pytest import raises
 from syntax_sugar.iter import Range, Iterator
-from syntax_sugar.infix import take, to, INF
+from syntax_sugar.util import take, to, INF
 from itertools import product