Merge remote-tracking branch 'origin/master' into gus/date-and-time

Author: wallymathieu

FSharpPlus.sln

@@ -16,7 +16,7 @@ install:
 build_script:
   - cmd: dotnet restore ./FSharpPlus.sln
   - cmd: dotnet build -c Release ./FSharpPlus.sln
-  - cmd: dotnet test -c Release tests/FSharpPlus.Tests
+  - cmd: dotnet test -c Test tests/FSharpPlus.Tests
   - ps: if ($env:VersionSuffix) { dotnet pack build.proj --version-suffix $env:VersionSuffix } else { dotnet pack build.proj }
 test: off
 artifacts:

appveyor.yml

@@ -15,7 +15,7 @@
 
   <Target Name="Test">
     <Exec Command='dotnet build src/FSharpPlus.TypeLevel' WorkingDirectory="$(RepoRootDir)" IgnoreStandardErrorWarningFormat="true" />
-    <Exec Command='dotnet test --blame-hang-timeout 30s tests/FSharpPlus.Tests -c Release --logger:trx' WorkingDirectory="$(RepoRootDir)" IgnoreStandardErrorWarningFormat="true" />
+    <Exec Command='dotnet test --blame-hang-timeout 30s tests/FSharpPlus.Tests -c Test --logger:trx' WorkingDirectory="$(RepoRootDir)" IgnoreStandardErrorWarningFormat="true" />
   </Target>
 
   <!-- dotnet msbuild -target:AllDocs build.proj -->

build.proj

@@ -22,8 +22,8 @@ Minimal complete definition
 
 *)
 (**
-    static member get_Id() : 'Category<'T,'T>
-    static member (<<<) (f:Category<'U,'V>, g:'Category<'T,'U>) : 'Category<'T,'V>
+    static member get_Id() : 'Category<'T, 'T>
+    static member (<<<) (f: 'Category<'U, 'V>, g: 'Category<'T, 'U>) : 'Category<'T, 'V>
 *)
 (**
 
@@ -35,7 +35,7 @@ Other operations
  * ``(>>>)``
 *)
 (**
-    static member (>>>) (g:'Category<'T,'U>, f:Category<'U,'V>) : 'Category<'T,'V>
+    static member (>>>) (g: 'Category<'T, 'U>, f: 'Category<'U, 'V>) : 'Category<'T, 'V>
 *)
 (**
 

docsrc/content/abstraction-category.fsx

@@ -23,8 +23,8 @@ Minimal complete definition
 
 *)
 (**
-    static member Extract (s:'Comonad<'T>) : 'T
-    static member (=>>)   (s:'Comonad<'T>, f:'Comonad<'T> -> 'U) : Comonad<'U>
+    static member Extract (s: 'Comonad<'T>) : 'T
+    static member (=>>)   (s: 'Comonad<'T>, f: 'Comonad<'T> -> 'U) : 'Comonad<'U>
 *)
 (**
 

docsrc/content/abstraction-comonad.fsx

@@ -22,7 +22,7 @@ Minimal complete definition
 *)
 (**
     static member Return (x: 'T) : 'Monad<'T>
-    static member (>>=) (x: Monad<'T>, f: 'T->Monad<'U>) : Monad<'U>
+    static member (>>=) (x: 'Monad<'T>, f: 'T -> 'Monad<'U>) : 'Monad<'U>
 *)
 (**
 
@@ -34,7 +34,7 @@ Other operations
  * ``join``
 *)
 (**
-    static member Join (x:'Monad<'Monad<'T>>) :'Monad<'T>
+    static member Join (x: 'Monad<'Monad<'T>>) : 'Monad<'T>
 *)
 (**
 
@@ -361,4 +361,4 @@ Recommended reading
    
    It contains examples using F#+ and an explanation from scratch.
 
-*)
+*)

docsrc/content/abstraction-monad.fsx

@@ -20,7 +20,7 @@ Minimal complete definition
  * ``dimap f g x``
 *)
 (**
-    static member Dimap (x:'Profunctor<'T,'V>, f:'U->'T, g:'V->'W) :'Profunctor<'U,'W>
+    static member Dimap (x: 'Profunctor<'T, 'V>, f: 'U -> 'T, g: 'V -> 'W) : 'Profunctor<'U, 'W>
 *)
 (**
 
@@ -31,14 +31,14 @@ Other operations
  * ``lmap f x``
 *)
 (**
-    static member Contramap (x:Profunctor<'T,'V>, f:'U->'T) :'Profunctor<'U,'V>
+    static member Contramap (x: 'Profunctor<'T, 'V>, f: 'U -> 'T) : 'Profunctor<'U, 'V>
 *)
 (**
 
  * ``rmap g x``
 *)
 (**
-    static member Map (x:Profunctor<'T,'V>, f:'V->'W) :'Profunctor<'T,'W>
+    static member Map (x: 'Profunctor<'T,'V>, f: 'V -> 'W) : 'Profunctor<'T, 'W>
 *)
 (**
 

docsrc/content/abstraction-profunctor.fsx

@@ -563,7 +563,7 @@ let loadedCoin = Prob [(Heads, 0.1); (Tails, 0.9)]
 // Prob [(false, 0.025); (false, 0.225); (false, 0.025); (false, 0.225);
 //       (false, 0.025); (false, 0.225); (false, 0.025); (true, 0.225)]
 let flipThree : Prob<bool> =
-    monad {
+    monad' {
         let! a = coin
         let! b = coin
         let! c = loadedCoin

src/FSharpPlus.Docs/Samples/Learn You a Haskell.fsx

@@ -111,26 +111,47 @@ type TryParse =
     static member TryParse (_: string        , _: TryParse) = fun x -> Some x                               : option<string>
     static member TryParse (_: StringBuilder , _: TryParse) = fun x -> Some (new StringBuilder (x: string)) : option<StringBuilder>
     #if !FABLE_COMPILER
-    static member TryParse (_: DateTime      , _: TryParse) = fun (x:string) -> DateTime.TryParseExact       (x, [|"yyyy-MM-ddTHH:mm:ss.fffZ"; "yyyy-MM-ddTHH:mm:ssZ"|], null, DateTimeStyles.RoundtripKind) |> tupleToOption : option<DateTime>
-    static member TryParse (_: DateTimeOffset, _: TryParse) = fun (x:string) -> DateTimeOffset.TryParseExact (x, [|"yyyy-MM-ddTHH:mm:ss.fffK"; "yyyy-MM-ddTHH:mm:ssK"|], null, DateTimeStyles.RoundtripKind) |> tupleToOption : option<DateTimeOffset>
+    
+    static member TryParse (_: DateTime      , _: TryParse) = fun (x:string) ->
+        match DateTime.TryParseExact (x, [|"yyyy-MM-ddTHH:mm:ss.fffZ"; "yyyy-MM-ddTHH:mm:ssZ"|], null, DateTimeStyles.RoundtripKind) with
+        | true, x -> Some x
+        | _ ->
+            match DateTime.TryParse (x, CultureInfo.InvariantCulture, DateTimeStyles.None) with
+            | true, x -> Some x
+            | _ -> None
+    
+    static member TryParse (_: DateTimeOffset, _: TryParse) = fun (x:string) ->
+        match DateTimeOffset.TryParseExact (x, [|"yyyy-MM-ddTHH:mm:ss.fffK"; "yyyy-MM-ddTHH:mm:ssK"|], null, DateTimeStyles.AssumeUniversal) with
+        | true, x -> Some x
+        | _ ->
+            match DateTimeOffset.TryParse (x, CultureInfo.InvariantCulture, DateTimeStyles.None) with
+            | true, x -> Some x
+            | _ -> None
     #endif
 
     static member inline Invoke (value: string) =
         let inline call_2 (a: ^a, b: ^b) = ((^a or ^b) : (static member TryParse : _*_ -> _) b, a)
         let inline call (a: 'a) = fun (x: 'x) -> call_2 (a, Unchecked.defaultof<'r>) x : 'r option
         call Unchecked.defaultof<TryParse> value
 
-type TryParse with
-    static member inline TryParse (_: 'R, _: Default2) = fun x ->
+    /// The F# signature
+    static member inline InvokeOnInstance (value: string) = (^R: (static member TryParse : string -> 'R option) value)
+
+    /// The .Net signature
+    static member inline InvokeOnConvention (value: string) =
         let mutable r = Unchecked.defaultof< ^R>
-        if (^R: (static member TryParse : _ * _ -> _) (x, &r)) then Some r else None
+        if (^R: (static member TryParse : _ * _ -> _) (value, &r)) then Some r else None
+
+    #if NET7_0
+    /// IParsable<'T>
+    static member InvokeOnInterface<'T when 'T :> IParsable<'T>> (value: string) =
+        let mutable r = Unchecked.defaultof<'T>
+        if ('T.TryParse(value, CultureInfo.InvariantCulture, &r)) then Some r else None
+    #endif
 
-    static member inline TryParse (_: ^t when ^t: null and ^t: struct, _: Default1) = id
-    static member inline TryParse (_: 'R, _: Default1) = fun x -> (^R: (static member TryParse : string -> 'R option) x)
 
 type Parse =
     inherit Default1
-    static member inline Parse (_: ^R                  , _: Default1) = fun (x:string) -> (^R: (static member Parse : _ -> ^R) x)
     static member inline Parse (_: ^R                  , _: Parse   ) = fun (x:string) -> (^R: (static member Parse : _ * _ -> ^R) (x, CultureInfo.InvariantCulture))
 
     static member inline Parse (_: 'T when 'T : enum<_>, _: Parse   ) = fun (x:string) ->
@@ -139,6 +160,16 @@ type Parse =
             | _         -> invalidArg "value" ("Requested value '" + x + "' was not found.")
         ) : 'enum
 
+    #if !FABLE_COMPILER
+    static member Parse (_: DateTime      , _: Parse) = fun (x:string) ->
+        match DateTime.TryParseExact (x, [|"yyyy-MM-ddTHH:mm:ss.fffZ"; "yyyy-MM-ddTHH:mm:ssZ"|], null, DateTimeStyles.RoundtripKind) with
+        | true, x -> x
+        | _ -> DateTime.Parse (x, CultureInfo.InvariantCulture)
+
+    static member Parse (_: DateTimeOffset, _: Parse) = fun (x:string) ->
+        try DateTimeOffset.ParseExact (x, [|"yyyy-MM-ddTHH:mm:ss.fffK"; "yyyy-MM-ddTHH:mm:ssK"|], null, DateTimeStyles.AssumeUniversal)
+        with _ -> DateTimeOffset.Parse (x, CultureInfo.InvariantCulture)
+    #endif
 
     static member Parse (_: bool         , _: Parse) = fun (x:string) -> Boolean.Parse (x)
 
@@ -151,4 +182,46 @@ type Parse =
         let inline call (a: 'a) = fun (x: 'x) -> call_2 (a, Unchecked.defaultof<'r>) x : 'r
         call Unchecked.defaultof<Parse> value
 
+    static member inline InvokeOnInstance (value: string) = (^R: (static member Parse : _ -> ^R) value)
+
+
+type Parse with
+
+    static member inline Parse (_: ^R                  , _: Default4) = fun (value: string) ->
+        match TryParse.InvokeOnConvention value with
+        | Some x -> x : ^R
+        | None -> invalidArg "value" ("Error parsing value '" + value + "'.")
+
+    static member inline Parse (_: ^R                  , _: Default3) = fun (value: string) ->
+        match TryParse.InvokeOnInstance value with
+        | Some x -> x : ^R
+        | None -> invalidArg "value" ("Error parsing value '" + value + "'.")
+    
+    static member inline Parse (_: ^R                  , _: Default2) : string -> ^R  = Parse.InvokeOnInstance
+
+    #if NET7_0
+    static member Parse<'T when 'T :> IParsable<'T>> (_: 'T, _: Default1) = fun (x: string) -> 'T.Parse (x, CultureInfo.InvariantCulture)
+    static member inline Parse (_: ^t when ^t: null and ^t: struct, _: Default1) = id
+    #else
+    static member inline Parse (_: ^t when ^t: null and ^t: struct, _: Default2) = id
+    #endif
+
+type TryParse with
+
+    static member inline TryParse (_: 'R, _: Default4) : string -> 'R option = fun (value: string) ->
+        try Some (Parse.InvokeOnInstance value) with
+        | :? ArgumentNullException | :? FormatException -> None 
+        | _ -> reraise ()
+
+    static member inline TryParse (_: 'R, _: Default3) : string -> 'R option = TryParse.InvokeOnConvention
+
+    static member inline TryParse (_: 'R, _: Default2) : string -> 'R option = TryParse.InvokeOnInstance
+
+    #if NET7_0
+    static member inline TryParse (_: 'R, _: Default1) : string -> 'R option = TryParse.InvokeOnInterface
+    static member inline TryParse (_: ^t when ^t: null and ^t: struct, _: Default1) = id
+    #else
+    static member inline TryParse (_: ^t when ^t: null and ^t: struct, _: Default2) = id
+    #endif
+
 #endif