Support for void-returning Match (#6)

* Support for void-returning Match

* Fixing unit test

Author: jtmueller

src/RustyOptions.Tests/OptionTests.cs

@@ -83,6 +83,19 @@ public void CanMatch()
         Assert.Equal("empty", noneResult);
     }
 
+    [Fact]
+    public void CanMatchWithSideEffects()
+    {
+        var someInt = Some(42);
+        var noneInt = None<int>();
+
+        int output = 0;
+        someInt.Match(x => { output += x; }, () => { output -= 1; });
+        Assert.Equal(42, output);
+        noneInt.Match(x => { output += x; }, () => { output -= 1; });
+        Assert.Equal(41, output);
+    }
+
     [Fact]
     public void CanGetSpan()
     {

src/RustyOptions.Tests/ResultTests.cs

@@ -91,6 +91,19 @@ public void CanMatch()
         Assert.Equal(-1, errResult);
     }
 
+    [Fact]
+    public void CanMatchWithSideEffects()
+    {
+        var ok = Ok(42);
+        var err = Err<int>("oops");
+
+        int output = 0;
+        ok.Match(x => output += x, e => { if (e == "oops") { output -= 1; } });
+        Assert.Equal(42, output);
+        err.Match(x => output += x, e => { if (e == "oops") { output -= 1; } });
+        Assert.Equal(41, output);
+    }
+
     [Fact]
     public void CanUnwrap()
     {

src/RustyOptions.Tests/RustyOptions.Tests.csproj

@@ -8,6 +8,7 @@
     <LangVersion>11</LangVersion>
     <IsPackable>false</IsPackable>
     <AssemblyName>RustyOptions.Tests</AssemblyName>
+    <ReleaseVersion>0.2</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/RustyOptions.sln

@@ -34,5 +34,6 @@ Global
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		description = Option and Result types for C#, inspired by Rust
+		version = 0.2
 	EndGlobalSection
 EndGlobal

src/RustyOptions/Option.cs

@@ -5,7 +5,6 @@
 
 namespace RustyOptions;
 
-// TODO: Match that returns void?
 // TODO: OptionNumber that implements INumber?
 // TODO: Async?
 
@@ -66,8 +65,8 @@ public bool IsSome([MaybeNullWhen(false)] out T value)
     /// of the <see cref="Option{T}"/>.
     /// </summary>
     /// <typeparam name="T2">The return type of the given functions.</typeparam>
-    /// <param name="onSome">The function to pass the value to, if the result is <c>Ok</c>.</param>
-    /// <param name="onNone">The function to pass the error value to, if the result is <c>Err</c>.</param>
+    /// <param name="onSome">The function to pass the value to, if the option is <c>Some</c>.</param>
+    /// <param name="onNone">The function to call if the option is <c>None</c>.</param>
     /// <returns>The value returned by the called function.</returns>
     /// <exception cref="System.ArgumentNullException">Thrown if either <paramref name="onSome"/> or <paramref name="onNone"/> is null.</exception>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -78,6 +77,24 @@ public T2 Match<T2>(Func<T, T2> onSome, Func<T2> onNone)
         return _isSome ? onSome(_value) : onNone();
     }
 
+    /// <summary>
+    /// If the option is <c>Some</c>, passes the contained value to the <paramref name="onSome"/> function.
+    /// Otherwise calls the <paramref name="onNone"/> function.
+    /// </summary>
+    /// <param name="onSome">The function to call with the contained <c>Some</c> value, if any.</param>
+    /// <param name="onNone">The function to call if the option is <c>None</c>.</param>
+    /// <exception cref="System.ArgumentNullException">Thrown if either <paramref name="onSome"/> or <paramref name="onNone"/> is null.</exception>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public void Match(Action<T> onSome, Action onNone)
+    {
+        ThrowIfNull(onSome);
+        ThrowIfNull(onNone);
+        if (_isSome)
+            onSome(_value);
+        else
+            onNone();
+    }
+
     /// <summary>
     /// Returns the contained <c>Some</c> value, or throws an <see cref="InvalidOperationException"/>
     /// if the value is <c>None</c>.

src/RustyOptions/Result.cs

@@ -5,7 +5,6 @@
 
 namespace RustyOptions;
 
-// TODO: Match overload that returns void (for side effects)?
 // TODO: ResultNumber that implement INumber?
 // TODO: Async?
 
@@ -88,6 +87,24 @@ public T2 Match<T2>(Func<T, T2> onOk, Func<TErr, T2> onErr)
         ThrowIfNull(onOk);
         ThrowIfNull(onErr);
         return _isOk ? onOk(_value) : onErr(_err);
+    }
+
+    /// <summary>
+    /// Calls the <paramref name="onOk"/> with the <c>Ok</c> value, or calls <paramref name="onErr"/>
+    /// with the <c>Err</c> value, as appropriate.
+    /// </summary>
+    /// <param name="onOk">The function to pass the value to, if the result is <c>Ok</c>.</param>
+    /// <param name="onErr">The function to pass the error value to, if the result is <c>Err</c>.</param>
+    /// <exception cref="System.ArgumentNullException">Thrown if either <paramref name="onOk"/> or <paramref name="onErr"/> is null.</exception>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public void Match(Action<T> onOk, Action<TErr> onErr)
+    {
+        ThrowIfNull(onOk);
+        ThrowIfNull(onErr);
+        if (_isOk)
+            onOk(_value);
+        else
+            onErr(_err);
     }
 
     /// <summary>

src/RustyOptions/RustyOptions.csproj

@@ -7,14 +7,15 @@
     <AnalysisMode>Recommended</AnalysisMode>
     <LangVersion>11</LangVersion>
     <AssemblyName>RustyOptions</AssemblyName>
-    <Version>0.1.0</Version>
+    <Version>0.2.0</Version>
     <PackageId>RustyOptions</PackageId>
     <Authors>Joel Mueller</Authors>
     <Company></Company>
     <PackageDescription>Option and Result types for C#, inspired by Rust</PackageDescription>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/jtmueller/RustyOptions</RepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <ReleaseVersion>0.2</ReleaseVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(TargetFramework)' == 'Debug|net6.0' ">