Merge pull request #12 from Meerownymous/i11-add-map-tuple-constructors

feat: introduce map by tuples
Meerownymous · Dec 17, 2024 · c1858fb · c1858fb
2 parents 965d52a + f788c47
commit c1858fb
Show file tree

Hide file tree

Showing 14 changed files with 69 additions and 869 deletions.
diff --git a/src/Tonga/Map/AsMap.cs b/src/Tonga/Map/AsMap.cs
diff --git a/tests/Tonga.Tests/Map/AsMapTest.cs b/tests/Tonga.Tests/Map/AsMapTest.cs
@@ -1,16 +1,14 @@
-
-
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Threading;
-using Xunit;
+using System.Threading.Tasks;
 using Tonga.Enumerable;
+using Tonga.Map;
 using Tonga.Scalar;
-using Tonga.Tests;
-using System.Diagnostics;
-using System.Threading.Tasks;
+using Xunit;
 
-namespace Tonga.Map.Tests
+namespace Tonga.Tests.Map
 {
     public sealed class AsMapTests
     {
@@ -42,6 +40,18 @@ public void MapsKeysToValues()
             );
         }
 
+        [Fact]
+        public void BuildsFromTuples()
+        {
+            Assert.Equal(
+                20,
+                AsMap._(
+                    (45, 10),
+                    (33, 20)
+                )[33]
+            );
+        }
+
         [Theory]
         [InlineData(12, 39478624)]
         [InlineData(24, 60208801)]
@@ -198,4 +208,4 @@ public void BuildsFromInputsFasterThanMap()
             );
         }
     }
-}
+}
diff --git a/tests/Tonga.Tests/Map/AsPairTests.cs b/tests/Tonga.Tests/Map/AsPairTests.cs
@@ -1,9 +1,8 @@
-
-
 using System;
+using Tonga.Map;
 using Xunit;
 
-namespace Tonga.Map.Tests
+namespace Tonga.Tests.Map
 {
     public sealed class AsPairTests
     {
@@ -45,4 +44,4 @@ public void KnowsAboutBeingNotLazy()
             Assert.False(AsPair._("2", "4").IsLazy());
         }
     }
-}
+}
diff --git a/tests/Tonga.Tests/Map/DeepMapTests.cs b/tests/Tonga.Tests/Map/DeepMapTests.cs
@@ -1,8 +1,7 @@
-using System;
-using System.Diagnostics;
+using Tonga.Map;
 using Xunit;
 
-namespace Tonga.Map.Tests
+namespace Tonga.Tests.Map
 {
     public sealed class DeepMap
     {
@@ -14,10 +13,10 @@ public void RetrievesValueByDiggingDown()
                 new DeepMap<string[], string, int>(
                     digDown: key => key[0],
                     AsMap._(
-                        AsPair._(new string[] { "one", "rubbish" }, 1),
-                        AsPair._(new string[] { "two", "irrelevant stuff" }, 2)
+                        (["one", "rubbish"], 1),
+                        (new[] { "two", "irrelevant stuff" }, 2)
                     )
-                )[new string[] { "one", "otherthings" }]
+                )[["one", "otherthings"]]
             );
         }
 
@@ -29,12 +28,12 @@ public void CanBeRefined()
                 new DeepMap<string[], string, int>(
                     digDown: key => key[0],
                     AsMap._(
-                        AsPair._(new string[] { "one", "rubbish" }, 1),
-                        AsPair._(new string[] { "two", "irrelevant stuff" }, 2)
+                        (new[] { "one", "rubbish" }, 1),
+                        (new[] { "two", "irrelevant stuff" }, 2)
                     )
                 )
-                .With(AsPair._(new string[] { "three", "trash" }, 3))
-                [new string[] { "three", "otherthings" }]
+                .With(AsPair._(new[] { "three", "trash" }, 3))
+                [["three", "otherthings"]]
             );
         }
     }

diff --git a/tests/Tonga.Tests/Map/EmptyTests.cs b/tests/Tonga.Tests/Map/EmptyTests.cs
@@ -1,9 +1,10 @@
 
 
 
+using Tonga.Map;
 using Xunit;
 
-namespace Tonga.Map.Tests
+namespace Tonga.Tests.Map
 {
     public sealed class EmptyMapTests
     {

diff --git a/tests/Tonga.Tests/Map/FallbackTests.cs b/tests/Tonga.Tests/Map/FallbackTests.cs
@@ -1,7 +1,8 @@
 using System;
+using Tonga.Map;
 using Xunit;
 
-namespace Tonga.Map.Tests
+namespace Tonga.Tests.Map
 {
     public class FallbackMapTests
     {

diff --git a/tests/Tonga.Tests/Map/GroupedTest.cs b/tests/Tonga.Tests/Map/GroupedTest.cs
@@ -1,13 +1,12 @@
-
-
-using Xunit;
 using Tonga.Func;
 using Tonga.IO;
 using Tonga.List;
+using Tonga.Map;
 using Tonga.Number;
 using Tonga.Scalar;
+using Xunit;
 
-namespace Tonga.Map.Tests
+namespace Tonga.Tests.Map
 {
     public sealed class GroupedTest
     {

diff --git a/tests/Tonga.Tests/Map/MapEnvelopeTest.cs b/tests/Tonga.Tests/Map/MapEnvelopeTest.cs
@@ -1,11 +1,8 @@
-
-
-
 using System;
-using System.Collections.Generic;
+using Tonga.Map;
 using Xunit;
 
-namespace Tonga.Map.Tests
+namespace Tonga.Tests.Map
 {
     public class MapEnvelopeTest
     {

diff --git a/tests/Tonga.Tests/Map/MergedTests.cs b/tests/Tonga.Tests/Map/MergedTests.cs
@@ -1,8 +1,9 @@
 
 
+using Tonga.Map;
 using Xunit;
 
-namespace Tonga.Map.Tests
+namespace Tonga.Tests.Map
 {
     public sealed class JoinedTests
     {

diff --git a/tests/Tonga.Tests/Map/NoNullsTest.cs b/tests/Tonga.Tests/Map/NoNullsTest.cs
@@ -1,10 +1,8 @@
-
-
 using System;
-using System.Collections.Generic;
+using Tonga.Map;
 using Xunit;
 
-namespace Tonga.Map.Tests
+namespace Tonga.Tests.Map
 {
     public class MapNoNullTest
     {

diff --git a/tests/Tonga.Tests/Map/OneTimePairTests.cs b/tests/Tonga.Tests/Map/OneTimePairTests.cs
@@ -1,7 +1,8 @@
 using System;
+using Tonga.Map;
 using Xunit;
 
-namespace Tonga.Map.Tests
+namespace Tonga.Tests.Map
 {
     public sealed class OneTimePairTests
     {

diff --git a/tests/Tonga.Tests/Map/SortedTest.cs b/tests/Tonga.Tests/Map/SortedTest.cs
@@ -16,9 +16,9 @@ public void ValueStillBehindCorrectKeyMap(int key, int expectedValue)
         {
             var unsorted =
                 AsMap._(
-                    1, 4,
-                    6, 3,
-                   -5, 2
+                    (1, 4),
+                    (6, 3),
+                    (-5, 2)
                 );
 
             var sorted = Sorted._(unsorted);
@@ -56,9 +56,9 @@ public void SortsByFunction(int index, int expectedKey)
                 ItemAt._(
                     Sorted._(
                         AsMap._(
-                            1, 4,
-                            6, 3,
-                           -5, 2
+                            (1, 4),
+                            (6, 3),
+                            (-5, 2)
                         ),
                         (a, b) => a.CompareTo(b)
                     )
@@ -81,9 +81,9 @@ public void DefaultComparerSortsByKey(int index, int expectedKey)
                 AsList._(
                     Sorted._(
                         AsMap._(
-                            1, 4,
-                            6, 3,
-                            -5, 2
+                            (1, 4),
+                            (6, 3),
+                            (-5, 2)
                         )
                     ).Pairs()
                 )[index]

diff --git a/tests/Tonga.Tests/Map/StickyTests.cs b/tests/Tonga.Tests/Map/StickyTests.cs
@@ -1,6 +1,7 @@
+using Tonga.Map;
 using Xunit;
 
-namespace Tonga.Map.Tests
+namespace Tonga.Tests.Map
 {
     public sealed class StickyTests
     {

diff --git a/tests/Tonga.Tests/Map/VersionMapTests.cs b/tests/Tonga.Tests/Map/VersionMapTests.cs
@@ -1,10 +1,8 @@
-
-
 using System;
-using Xunit;
 using Tonga.Map;
+using Xunit;
 
-namespace Tonga.Map.Tests
+namespace Tonga.Tests.Map
 {
     public sealed class VersionMapTests
     {