Replace Error.New("None") with Errors.None

And added ToString to Error types
louthy · Jun 28, 2022 · 39d8a2b · 39d8a2b
1 parent 5bf6e3b
commit 39d8a2b
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 35 deletions.
diff --git a/LanguageExt.Core/Common/Error.cs b/LanguageExt.Core/Common/Error.cs
@@ -338,6 +338,9 @@ public record Expected(string Message, int Code, Option<Error> Inner = default)
     public override Option<Error> Inner { get; } = 
         Inner;
 
+    public override string ToString() => 
+        Message;
+
     /// <summary>
     /// Generates a new `ErrorException` that contains the `Code`, `Message`, and `Inner` of this `Error`.
     /// </summary>
@@ -407,6 +410,9 @@ public record Exceptional(string Message, int Code) : Error
     [DataMember]
     public override int Code { get; } = Code;
 
+    public override string ToString() => 
+        Message;
+
     /// <summary>
     /// Returns the inner exception as an `Error` (if one exists), `None` otherwise
     /// </summary>
@@ -477,6 +483,9 @@ public sealed record BottomError() : Exceptional(BottomException.Default)
 
     public override string Message => 
         Errors.BottomText;
+
+    public override string ToString() => 
+        Message;
 
     /// <summary>
     /// Gets the Exception
@@ -537,7 +546,10 @@ public sealed record ManyErrors([property: DataMember] Seq<Error> Errors) : Erro
 
     public override string Message { get; } =
         Errors.ToFullArrayString();
-
+
+    public override string ToString() => 
+        Errors.ToFullArrayString();
+
     /// <summary>
     /// Gets the `Exception`
     /// </summary>

diff --git a/LanguageExt.Core/Common/ErrorException.cs b/LanguageExt.Core/Common/ErrorException.cs
@@ -379,9 +379,14 @@ public sealed class ManyExceptions : ErrorException
 [Serializable]
 public class BottomException : ExceptionalException
 {
-    public static readonly BottomException Default = new ();
+    public static readonly BottomException Default;
 
-    public BottomException() : base(Default)
+    static BottomException()
+    {
+        Default = new();
+    }
+
+    public BottomException() : base(Errors.BottomText, Errors.BottomCode)
     {
     }
 

diff --git a/LanguageExt.Core/Monads/Alternative Value Monads/Option/Option/Option.cs b/LanguageExt.Core/Monads/Alternative Value Monads/Option/Option/Option.cs
@@ -574,7 +574,7 @@ public Option<A> Do(Action<A> f)
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public Eff<A> ToEff() =>
-            ToEff(Error.New("None"));
+            ToEff(Errors.None);
 
         /// <summary>
         /// Convert the structure to an Eff
@@ -597,7 +597,7 @@ public Option<A> Do(Action<A> f)
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public Aff<A> ToAff() =>
-            ToAff(Error.New("None"));
+            ToAff(Errors.None);
 
         /// <summary>
         /// Convert the structure to an Aff
@@ -620,7 +620,7 @@ public Option<A> Do(Action<A> f)
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public Fin<A> ToFin() =>
-            ToFin(Error.New("None"));
+            ToFin(Errors.None);
 
         /// <summary>
         /// Convert the structure to a Fin

diff --git a/LanguageExt.Core/Monads/Alternative Value Monads/Option/OptionAsync/OptionAsync.cs b/LanguageExt.Core/Monads/Alternative Value Monads/Option/OptionAsync/OptionAsync.cs
@@ -485,7 +485,7 @@ public async Task<string> ToStringAsync()
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public Aff<A> ToAff() =>
-            ToAff(Error.New("None"));
+            ToAff(Errors.None);
 
         /// <summary>
         /// Convert the structure to an Aff

diff --git a/LanguageExt.Core/Monads/Alternative Value Monads/Option/OptionUnsafe/OptionUnsafe.cs b/LanguageExt.Core/Monads/Alternative Value Monads/Option/OptionUnsafe/OptionUnsafe.cs
@@ -536,7 +536,7 @@ public OptionUnsafe<A> Do(Action<A> f)
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public Eff<A> ToEff() =>
-            ToEff(Error.New("None"));
+            ToEff(Errors.None);
 
         /// <summary>
         /// Convert the structure to an Eff
@@ -557,7 +557,7 @@ public OptionUnsafe<A> Do(Action<A> f)
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public Aff<A> ToAff() =>
-            ToAff(Error.New("None"));
+            ToAff(Errors.None);
 
         /// <summary>
         /// Convert the structure to an Aff

diff --git a/LanguageExt.Core/Monads/Alternative Value Monads/Try/TryOption/TryOption.Extensions.cs b/LanguageExt.Core/Monads/Alternative Value Monads/Try/TryOption/TryOption.Extensions.cs
@@ -321,7 +321,7 @@ public static Unit Match<A>(this TryOption<A> self, Action<A> Some, Action None,
     public static Eff<A> ToEff<A>(this TryOption<A> ma) =>
         Prelude.EffMaybe(() =>
             ma.Match(Some: Fin<A>.Succ,
-                     None: () => Fin<A>.Fail(Error.New("None")),
+                     None: () => Fin<A>.Fail(Errors.None),
                      Fail: e => Fin<A>.Fail(e)));
 
     /// <summary>

diff --git a/...eExt.Core/Monads/Alternative Value Monads/Try/TryOptionAsync/TryOptionAsync.Extensions.cs b/...eExt.Core/Monads/Alternative Value Monads/Try/TryOptionAsync/TryOptionAsync.Extensions.cs
@@ -1154,7 +1154,7 @@ public static async Task<Unit> Match<A>(this TryOptionAsync<A> self, Action<A> S
     public static Aff<A> ToAff<A>(this TryOptionAsync<A> ma) =>
         Prelude.AffMaybe(async () => await
             ma.Match(Some: Fin<A>.Succ,
-                     None: () => Fin<A>.Fail(Error.New("None")),
+                     None: () => Fin<A>.Fail(Errors.None),
                      Fail: e => Fin<A>.Fail(e)));
 
     /// <summary>

diff --git a/Samples/TestBed/ApplicativeTest.cs b/Samples/TestBed/ApplicativeTest.cs
@@ -0,0 +1,41 @@
+namespace TestBed;
+
+using System;
+using System.Diagnostics;
+using LanguageExt;
+using System.Threading.Tasks;
+using static LanguageExt.Prelude;
+
+public static class ApplicativeTest
+{
+    static Aff<Unit> delay(int milliseconds) =>
+        Aff(async () =>
+        {
+            await Task.Delay(milliseconds);
+            return unit;
+        });
+
+    static Aff<int> parse(string str) =>
+        from x in parseInt(str).ToAff()
+        from _ in delay(1000)
+        select x;
+
+    static Aff<int> add(string sx, string sy) =>
+        SuccessAff((int x, int y) => x + y) 
+            .Apply(parse(sx))
+            .Apply(parse(sy));
+
+    public static async Task Test()
+    {
+        await Report(add("100", "200"));
+        await Report(add("zzz", "yyy"));
+    }
+
+    static async Task Report<A>(Aff<A> ma)
+    {
+        var sw = Stopwatch.StartNew();
+        var r = await ma.Run();
+        sw.Stop();
+        Console.WriteLine($"Result: {r} in {sw.ElapsedMilliseconds}ms");
+    }
+}
diff --git a/Samples/TestBed/Program.cs b/Samples/TestBed/Program.cs
@@ -72,30 +72,7 @@ static void Main(string[] args)
         //testing.Run(Runtime.New());
         //var _ = QueueExample<Runtime>.Issue1065().RunUnit(new Runtime()).Result;
         //ScheduleTests.Run();
-
-        Aff<Unit> delay(int milliseconds) =>
-            Aff(async () =>
-            {
-                await Task.Delay(milliseconds);
-                return unit;
-            });
-
-        Aff<A> delayed<A>(A x) =>
-            from _ in delay(1000)
-            select x;
-
-        var effect = SuccessAff((string sx, string sy) => 
-                                    from x in parseInt(sx)
-                                    from y in parseInt(sy)
-                                    select x + y)
-                        .Apply(delayed("100"))
-                        .Apply(delayed("200"));
-
-        var sw = Stopwatch.StartNew();
-        var r = effect.Run().GetAwaiter().GetResult();
-        sw.Stop();
-
-        Console.Write($"Result: {r} in {sw.ElapsedMilliseconds}ms");        
+        ApplicativeTest.Test().GetAwaiter().GetResult();
     }
 
     public static async Task PipesTest()