koatl 0.3.18__tar.gz → 0.3.19__tar.gz

{koatl-0.3.18 → koatl-0.3.19}/Cargo.lock

@@ -190,7 +190,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "koatl"
-version = "0.3.18"
+version = "0.3.19"
 dependencies = [
  "ariadne",
  "koatl-core",

{koatl-0.3.18 → koatl-0.3.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: koatl
-Version: 0.3.18
+Version: 0.3.19
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{koatl-0.3.18 → koatl-0.3.19}/koatl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "koatl"
-version = "0.3.18"
+version = "0.3.19"
 edition = "2021"
 homepage = "https://koatl.org"
 

{koatl-0.3.18 → koatl-0.3.19}/koatl/python/koatl/std/iter.tl

@@ -84,16 +84,20 @@ export Iterable = class(Traversable, Trait):
 
         impl()
 
-    flat_map = (self, f) => itertools.chain.from_iterable(self.map(f))
+    flat_map = (self, f=None) =>
+        if f === None:
+            itertools.chain.from_iterable(self.iter)
+        else:
+            itertools.chain.from_iterable(self.iter.map(f))
 
-    reverse = self => reversed(list(self.iter))
+    reversed = self => reversed(list(self.iter))
 
-    sort = (self, key=None, reverse=False) =>
+    sorted = (self, key=None, reverse=False) =>
         sorted(self.iter, key=key, reverse=reverse)
 
     copy = self => itertools.tee(self.iter)
 
-    count = (self, f=None) =>
+    tally = (self, f=None) =>
         let acc = 0
         if f === None:
             for _ in self:
@@ -187,7 +191,7 @@ export Iterable = class(Traversable, Trait):
         impl()
 
     join = (self, sep="") =>
-        sep.join(self.map(str))
+        sep.join(self.iter.map(str))
 
     sum = self =>
         let acc = 0

{koatl-0.3.18 → koatl-0.3.19}/koatl/tests/test_iterable.tl

@@ -57,11 +57,14 @@ test_all = () =>
     assert_eq([].all(x => x > 0), True)
     assert_eq([True, True, True].all(x => x), True)
 
-test_count = () =>
-    # count() works on Iterable trait via .iter
-    assert_eq([1, 2, 3, 4, 5].iter.count(x => x > 2), 3)
-    assert_eq([1, 2, 3, 4, 5].iter.count(x => x %% 2 == 0), 2)
-    assert_eq([1, 2, 3].iter.count(x => x > 10), 0)
+test_tally = () =>
+    # tally() works on Iterable trait via .iter
+    assert_eq([1, 2, 3, 4, 5].iter.tally(), 5)
+    assert_eq([].iter.tally(), 0)
+    assert_eq((..10).tally(), 10)
+    assert_eq([1, 2, 3, 4, 5].iter.tally(x => x > 2), 3)
+    assert_eq([1, 2, 3, 4, 5].iter.tally(x => x %% 2 == 0), 2)
+    assert_eq([1, 2, 3].iter.tally(x => x > 10), 0)
 
 test_take = () =>
     assert_eq([1, 2, 3, 4, 5].take(3).list(), [1, 2, 3])
@@ -104,16 +107,15 @@ test_cycle = () =>
     assert_eq([1, 2, 3].cycle().take(7).list(), [1, 2, 3, 1, 2, 3, 1])
     assert_eq([5].cycle().take(3).list(), [5, 5, 5])
 
-test_reverse = () =>
-    # reverse() is a method on Iterable trait, accessed via .iter
-    assert_eq(list([1, 2, 3, 4, 5].iter.reverse()), [5, 4, 3, 2, 1])
-    assert_eq(list([1].iter.reverse()), [1])
-    assert_eq(list([].iter.reverse()), [])
+test_reversed = () =>
+    assert_eq(list([1, 2, 3, 4, 5].reversed()), [5, 4, 3, 2, 1])
+    assert_eq(list([1].reversed()), [1])
+    assert_eq(list([].reversed()), [])
 
-test_sort = () =>
-    assert_eq([3, 1, 4, 1, 5].iter.sort().list(), [1, 1, 3, 4, 5])
-    assert_eq(["c", "a", "b"].iter.sort().list(), ["a", "b", "c"])
-    assert_eq([].iter.sort().list(), [])
+test_sorted = () =>
+    assert_eq([3, 1, 4, 1, 5].iter.sorted().list(), [1, 1, 3, 4, 5])
+    assert_eq(["c", "a", "b"].iter.sorted().list(), ["a", "b", "c"])
+    assert_eq([].iter.sorted().list(), [])
 
 test_join = () =>
     assert_eq(["a", "b", "c"].join(", "), "a, b, c")

{koatl-0.3.18 → koatl-0.3.19}/python/koatl/std/iter.tl

@@ -84,16 +84,20 @@ export Iterable = class(Traversable, Trait):
 
         impl()
 
-    flat_map = (self, f) => itertools.chain.from_iterable(self.map(f))
+    flat_map = (self, f=None) =>
+        if f === None:
+            itertools.chain.from_iterable(self.iter)
+        else:
+            itertools.chain.from_iterable(self.iter.map(f))
 
-    reverse = self => reversed(list(self.iter))
+    reversed = self => reversed(list(self.iter))
 
-    sort = (self, key=None, reverse=False) =>
+    sorted = (self, key=None, reverse=False) =>
         sorted(self.iter, key=key, reverse=reverse)
 
     copy = self => itertools.tee(self.iter)
 
-    count = (self, f=None) =>
+    tally = (self, f=None) =>
         let acc = 0
         if f === None:
             for _ in self:
@@ -187,7 +191,7 @@ export Iterable = class(Traversable, Trait):
         impl()
 
     join = (self, sep="") =>
-        sep.join(self.map(str))
+        sep.join(self.iter.map(str))
 
     sum = self =>
         let acc = 0