TryParse

Author: wallymathieu

src/FSharpPlus.CSharp/Library.fs

@@ -3,6 +3,7 @@ open System.Runtime.CompilerServices
 open System
 open System.Collections.Generic
 open FSharpPlus
+open FSharpPlus.Internals
 module internal Internals=
     module Result=
         /// Wraps a function, encapsulates any exception thrown within to a Result
@@ -14,8 +15,10 @@ module internal Internals=
         /// Stores the cast value in Ok if successful, otherwise stores the exception in Error
         let inline cast (o: obj) = protect unbox o
 
+    let inline tupleToOption x = match x with true, value -> Some value | _ -> None
 
 open Internals
+open System.Globalization
 
 [<Extension>]
 type Options =
@@ -149,23 +152,19 @@ type Options =
 
     static member SomeUnit = Some()
 
-    static member ParseInt s : int32 option = tryParse s
+type NumberParser(numberstyles: NumberStyles, cultureInfo: CultureInfo)=
+    new()=NumberParser(NumberStyles.Any, CultureInfo.InvariantCulture)
+    member __.ParseDateTimeOffset s :DateTimeOffset option= tryParse s
+    member __.TryParseDecimal (x:string)= Decimal.TryParse (x, numberstyles, cultureInfo) |> tupleToOption : option<decimal>
+    member __.TryParseFloat (x:string)= Single.TryParse  (x, numberstyles, cultureInfo) |> tupleToOption : option<float32>
+    member __.TryParseDouble (x:string)= Double.TryParse  (x, numberstyles, cultureInfo) |> tupleToOption : option<float>
+    member __.TryParseUint16 (x:string)= UInt16.TryParse  (x, numberstyles, cultureInfo) |> tupleToOption : option<uint16>
+    member __.TryParseUint32 (x:string)= UInt32.TryParse  (x, numberstyles, cultureInfo) |> tupleToOption : option<uint32>
+    member __.TryParseUint64 (x:string)= UInt64.TryParse  (x, numberstyles, cultureInfo) |> tupleToOption : option<uint64>
+    member __.TryParseInt16 (x:string)= Int16.TryParse   (x, numberstyles, cultureInfo) |> tupleToOption : option<int16>
+    member __.TryParseInt (x:string)= Int32.TryParse   (x, numberstyles, cultureInfo) |> tupleToOption : option<int>
+    member __.TryParseInt64 (x:string)= Int64.TryParse   (x, numberstyles, cultureInfo) |> tupleToOption : option<int64>
 
-    static member ParseDecimal s : Decimal option= tryParse s
-
-    static member ParseDouble s : Double option = tryParse s
-
-    static member ParseFloat s : Single option = tryParse s
-
-    static member ParseInt16 s : Int16 option= tryParse s
-
-    static member ParseInt64 s : Int64 option= tryParse s
-
-    static member ParseByte s : byte option= tryParse s
-
-    static member ParseDateTime s : DateTime option= tryParse s
-
-    static member ParseDateTimeOffset s :DateTimeOffset option= tryParse s
 
 [<Extension>]
 type Choices =

tests/FSharpPlus.CSharp.Tests/OptionTests.cs

@@ -155,25 +155,29 @@ public void Dont() {
 
         [Test]
         public void TryParseInt() {
-            var a = Options.ParseInt("123");
+            var parser = new NumberParser();
+            var a = parser.TryParseInt("123");
             Assert.AreEqual(123, a.Value);
         }
 
-/*      [Test]
+       [Test]
         public void TryParseDec() {
-            var a = Option.ParseDecimal("123.44", NumberStyles.Any, CultureInfo.InvariantCulture);
+            var parser = new NumberParser(NumberStyles.Any, CultureInfo.InvariantCulture);
+            var a = parser.TryParseDecimal("123.44");
             Assert.AreEqual(123.44m, a.Value);
-        }*/
+        }
 
         [Test]
         public void TryParseDouble() {
-            var a = Options.ParseDouble("123E12");
+            var parser = new NumberParser();
+            var a = parser.TryParseDouble("123E12");
             Assert.AreEqual(123E12, a.Value);
         }
 
         [Test]
         public void TryParseFloat() {
-            var a = Options.ParseFloat("12");
+            var parser = new NumberParser();
+            var a = parser.TryParseFloat("12");
             Assert.AreEqual(12, a.Value);
         }
 

tests/FSharpPlus.CSharp.Tests/ResultTests.cs

@@ -62,9 +62,10 @@ public void Cast_Exception() {
 
         [Test]
         public void ResultToOption() {
+            var parser=new NumberParser();
             object a = 40;
             const string b = "60";
-            var r = from i in Options.ParseInt(b)
+            var r = from i in parser.TryParseInt(b)
                     from j in Results.Cast<int>(a).ToOption()
                     select i + j;
             Assert.AreEqual(100.Some(), r);
@@ -73,9 +74,10 @@ from j in Results.Cast<int>(a).ToOption()
 
         [Test]
         public void OptionToResult() {
+            var parser=new NumberParser();
             object a = 40;
             const string b = "60";
-            var r = from i in Options.ParseInt(b).ToResult(new Exception())
+            var r = from i in parser.TryParseInt(b).ToResult(new Exception())
                     from j in Results.Cast<int>(a)
                     select i + j;
             r.Match(i => Assert.AreEqual(100, i),
@@ -84,9 +86,10 @@ from j in Results.Cast<int>(a)
 
         [Test]
         public void SelectSecond_OK() {
+            var parser=new NumberParser();
             object a = 40;
             const string b = "60";
-            var r = from i in Options.ParseInt(b).ToResult("Invalid value b")
+            var r = from i in parser.TryParseInt(b).ToResult("Invalid value b")
                     from j in Results.Cast<int>(a).SelectError(_ => "Invalid value a")
                     select i + j;
             r.Match(i => Assert.AreEqual(100, i),
@@ -95,9 +98,10 @@ from j in Results.Cast<int>(a).SelectError(_ => "Invalid value a")
 
         [Test]
         public void SelectSecond_Error() {
+            var parser=new NumberParser();
             object a = 40;
             const string b = "xx";
-            var r = from i in Options.ParseInt(b).ToResult("Invalid value b")
+            var r = from i in parser.TryParseInt(b).ToResult("Invalid value b")
                     from j in Results.Cast<int>(a).SelectError(_ => "Invalid value a")
                     select i + j;
             r.Match(i => Assert.Fail("should not have succeeded with value {0}", i),