/by/ -> /step/

Author: czheo

README.md

@@ -111,7 +111,7 @@ import requests
 
 ### infix function
 ``` python
-from syntax_sugar import is_a, has, to, by, drop
+from syntax_sugar import is_a, has, to, step, drop
 
 1 /is_a/ int
 # equivalent to `isinstance(1, int)`
@@ -129,11 +129,11 @@ range(10) /has/ '__iter__'
 '0' /to/ '9'
 # We can also have a range of characters :)
 
-1 /to/ 10 /by/ 2
+1 /to/ 10 /step/ 2
 # We can also specify step sizes.
 # Similar to `range(1, 11, 2)`
 
-10 /to/ 1 /by/ 2
+10 /to/ 1 /step/ 2
 # Go backward.
 # Similar to `range(10, 0, -2)`
 
@@ -160,7 +160,7 @@ list(1 /to/ INF /take/ 5)
 # there is a `take` functon which is similar to itertools.islice
 # return [1, 2, 3, 4, 5]
 
-list(0 /to/ NEGINF /by/ 2 /take/ 5)
+list(0 /to/ NEGINF /step/ 2 /take/ 5)
 # also works with negative infinity.
 # return [0, -2, -4, -6, -8]
 

syntax_sugar/infix.py

@@ -5,7 +5,7 @@
     'infix',
     'is_a',
     'to',
-    'by',
+    'step',
     'INF',
     'NEGINF',
     'has',
@@ -31,7 +31,7 @@ def to(start, end):
     return Iterator(Range(start, end))
 
 @infix
-def by(obj, step):
+def step(obj, step):
     # ex. -2 step -> 2 step
     step = abs(step)
     obj = Iterator(obj) if not obj /is_a/ Iterator else obj

tests/test_infix.py

@@ -19,18 +19,18 @@ def test_int_to_int():
         _assert_iter(start /to/ end, range(start, end - 1, -1))
 
 def test_int_to_int_with_step():
-    _assert_iter(1 /to/ 1 /by/ 2, [1])
-    _assert_iter(2 /to/ 1 /by/ 2, [2])
+    _assert_iter(1 /to/ 1 /step/ 2, [1])
+    _assert_iter(2 /to/ 1 /step/ 2, [2])
     for i in range(100):
         start, end = random.randint(1, 1e3), random.randint(1, 1e3)
-        step = random.randint(1, 10)
+        s = random.randint(1, 10)
         end += start
-        _assert_iter(start /to/ end /by/ step, range(start, end + 1, step))
-        _assert_iter(start /to/ end /by/ -step, range(start, end + 1, step))
+        _assert_iter(start /to/ end /step/ s, range(start, end + 1, s))
+        _assert_iter(start /to/ end /step/ -s, range(start, end + 1, s))
 
         start, end = end, start
-        _assert_iter(start /to/ end /by/ -step, range(start, end - 1, -step))
-        _assert_iter(start /to/ end /by/ step, range(start, end - 1, -step))
+        _assert_iter(start /to/ end /step/ -s, range(start, end - 1, -s))
+        _assert_iter(start /to/ end /step/ s, range(start, end - 1, -s))
 
 def test_str_to_str():
     _assert_iter('A' /to/ 'Z', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')
@@ -42,20 +42,20 @@ def test_str_to_str():
     _assert_iter('v' /to/ 'd', 'vutsrqponmlkjihgfed')
 
 def test_str_to_str_with_step():
-    _assert_iter('A' /to/ 'Z' /by/ 3, 'ADGJMPSVY')
-    _assert_iter('A' /to/ 'Z' /by/ -3, 'ADGJMPSVY')
-    _assert_iter('Z' /to/ 'A' /by/ -3, 'ZWTQNKHEB')
-    _assert_iter('Z' /to/ 'A' /by/ 3, 'ZWTQNKHEB')
-    _assert_iter('a' /to/ 'z' /by/ 4, 'aeimquy')
-    _assert_iter('a' /to/ 'z' /by/ -4, 'aeimquy')
-    _assert_iter('z' /to/ 'a' /by/ -4, 'zvrnjfb')
-    _assert_iter('z' /to/ 'a' /by/ 4, 'zvrnjfb')
-    _assert_iter('D' /to/ 'V' /by/ 5, 'DINS')
-    _assert_iter('D' /to/ 'V' /by/ -5, 'DINS')
-    _assert_iter('V' /to/ 'D' /by/ -5, 'VQLG')
-    _assert_iter('V' /to/ 'D' /by/ 5, 'VQLG')
-    _assert_iter('v' /to/ 'd' /by/ -3, 'vspmjgd')
-    _assert_iter('v' /to/ 'd' /by/ 3, 'vspmjgd')
+    _assert_iter('A' /to/ 'Z' /step/ 3, 'ADGJMPSVY')
+    _assert_iter('A' /to/ 'Z' /step/ -3, 'ADGJMPSVY')
+    _assert_iter('Z' /to/ 'A' /step/ -3, 'ZWTQNKHEB')
+    _assert_iter('Z' /to/ 'A' /step/ 3, 'ZWTQNKHEB')
+    _assert_iter('a' /to/ 'z' /step/ 4, 'aeimquy')
+    _assert_iter('a' /to/ 'z' /step/ -4, 'aeimquy')
+    _assert_iter('z' /to/ 'a' /step/ -4, 'zvrnjfb')
+    _assert_iter('z' /to/ 'a' /step/ 4, 'zvrnjfb')
+    _assert_iter('D' /to/ 'V' /step/ 5, 'DINS')
+    _assert_iter('D' /to/ 'V' /step/ -5, 'DINS')
+    _assert_iter('V' /to/ 'D' /step/ -5, 'VQLG')
+    _assert_iter('V' /to/ 'D' /step/ 5, 'VQLG')
+    _assert_iter('v' /to/ 'd' /step/ -3, 'vspmjgd')
+    _assert_iter('v' /to/ 'd' /step/ 3, 'vspmjgd')
 
 def test_infinity():
     with raises(ValueError):
@@ -67,11 +67,11 @@ def test_infinity():
     _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 /by/ 2 /take/ 10, list(range(1, 100, 2))[:10])
-    _assert_iter(1 /to/ NEGINF /by/ 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, list(range(1, -100, -2))[:10])
 
-    _assert_iter(1 /to/ NEGINF /by/ 2 /take/ 10 /drop/ 2, list(range(1, -100, -2))[2:10])
-    _assert_iter(1 /to/ NEGINF /by/ 2 /drop/ 5 /take/ 3, [-9, -11, -13])
+    _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])
 
 
 def test_take():