Skip to content

Commit 23d1fb6

Browse files
gustygusty
committed
Change overload priority for OfSeq / OfList
1 parent 9880456 commit 23d1fb6

File tree

2 files changed

+97
-13
lines changed

2 files changed

+97
-13
lines changed

‎src/FSharpPlus/Control/Collection.fs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,24 @@ open FSharpPlus.Internals
1212

1313
type OfSeq =
1414
inherit Default1
15-
16-
static member inline OfSeq ((x: seq<'t>, _: 'R), _: Default5) : 'R =
15+
16+
static member inline OfSeq ((x: seq<'t>, _: '``Foldable'<T>``), _: Default5) : '``Foldable'<T>`` =
1717
#if TEST_TRACE
18-
Traces.add "OfSeq, Default5-seq<'t>"
18+
Traces.add "OfSeq, Return+Sum<'t>"
1919
#endif
20-
(^R : (new : seq<'t> -> ^R) x)
20+
x |> Seq.map Return.Invoke |> Sum.Invoke
2121

22-
static member inline OfSeq ((x: seq<KeyValuePair<'k,'v>>, _: 'R), _: Default5) : 'R =
22+
static member inline OfSeq ((x: seq<'t>, _: 'R), _: Default4) : 'R =
2323
#if TEST_TRACE
24-
Traces.add "OfSeq, Default5-seq<KeyValuePair<'k,'v>>"
24+
Traces.add "OfSeq, #new seq<'t>"
2525
#endif
26-
(^R : (new : seq<'k*'v> -> ^R) (Seq.map (|KeyValue|) x))
26+
(^R : (new : seq<'t> -> ^R) x)
2727

28-
static member inline OfSeq ((x: seq<'t>, _: '``Foldable'<T>``), _: Default4) : '``Foldable'<T>`` =
28+
static member inline OfSeq ((x: seq<KeyValuePair<'k,'v>>, _: 'R), _: Default4) : 'R =
2929
#if TEST_TRACE
30-
Traces.add "OfSeq, Default4-seq<'t>"
30+
Traces.add "OfSeq, #new seq<KeyValuePair<'k,'v>>"
3131
#endif
32-
x |> Seq.map Return.Invoke |> Sum.Invoke
32+
(^R : (new : seq<'k*'v> -> ^R) (Seq.map (|KeyValue|) x))
3333

3434
static member OfSeq ((x: seq<'t> , _: seq<'t> ), _: Default3) = x
3535
static member OfSeq ((x: seq<'t> , _: ICollection<'t> ), _: Default3) = let d = ResizeArray () in Seq.iter d.Add x; d :> ICollection<'t>
@@ -81,10 +81,10 @@ type OfSeq =
8181
type OfList =
8282
inherit Default1
8383

84-
static member inline OfList ((x: list<'t> , _: 'R ), _: Default6) = (^R : (new : seq<'t> -> ^R) (List.toSeq x)) : 'R
85-
static member inline OfList ((x: list<KeyValuePair<'k,'v>>, _: 'R ), _: Default6) = (^R : (new : seq<'k*'v> -> ^R) (Seq.map (|KeyValue|) x)) : 'R
84+
static member inline OfList ((x: list<'t> , _: '``Foldable'<T>`` ), _: Default6) = x |> List.map Return.Invoke |> Sum.Invoke : '``Foldable'<T>``
8685

87-
static member inline OfList ((x: list<'t> , _: '``Foldable'<T>`` ), _: Default5) = x |> List.map Return.Invoke |> Sum.Invoke : '``Foldable'<T>``
86+
static member inline OfList ((x: list<'t> , _: 'R ), _: Default5) = (^R : (new : seq<'t> -> ^R) (List.toSeq x)) : 'R
87+
static member inline OfList ((x: list<KeyValuePair<'k,'v>>, _: 'R ), _: Default5) = (^R : (new : seq<'k*'v> -> ^R) (Seq.map (|KeyValue|) x)) : 'R
8888

8989
static member OfList ((x: list<'t> , _: seq<'t> ), _: Default4) = List.toSeq x
9090
#if !FABLE_COMPILER

‎src/FSharpPlus/Data/DefaultableDict.fs‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
namespace FSharpPlus.Data
2+
3+
open System
4+
open System.Runtime.InteropServices
5+
open System.ComponentModel
6+
open System.Collections.Generic
7+
open FSharpPlus
8+
9+
[<AutoOpen>]
10+
module Auto =
11+
let icollection value =
12+
{
13+
new ICollection<'t> with
14+
member _.Contains (item: 't) = obj.ReferenceEquals (item, value)
15+
member _.GetEnumerator () = (Seq.initInfinite (fun _ -> value)).GetEnumerator () :> System.Collections.IEnumerator
16+
member _.GetEnumerator () = (Seq.initInfinite (fun _ -> value)).GetEnumerator () : IEnumerator<'t>
17+
member _.IsReadOnly = true
18+
19+
member _.Add (_item: 't) : unit = raise (System.NotImplementedException())
20+
member _.Clear () : unit = raise (System.NotImplementedException())
21+
member _.CopyTo (_array: 't [], _arrayIndex: int) : unit = raise (System.NotImplementedException())
22+
member _.Count : int = raise (System.NotImplementedException())
23+
member _.Remove (_item: 't): bool = raise (System.NotImplementedException())
24+
}
25+
26+
type DefaultableDict<'TKey, 'TValue>(source: 'TValue) =
27+
interface IDictionary<'TKey, 'TValue> with
28+
member _.TryGetValue (_key: 'TKey, value: byref<'TValue>) = value <- source; true
29+
member _.Count =
30+
if typeof<'TKey>.IsValueType then
31+
if typeof<'TKey> = typeof<bool> then 2
32+
else
33+
let s = sizeof<'TKey>
34+
if s < 4 then pown 2 (sizeof<'TKey> * 8)
35+
else -1
36+
elif typeof<'TKey> = typeof<unit> then 1
37+
else -1
38+
member _.ContainsKey (_key: 'TKey) = true
39+
member _.Contains (item: KeyValuePair<'TKey,'TValue>) = obj.ReferenceEquals (item.Value, source)
40+
member _.GetEnumerator () = invalidOp "Key set is potentially infinite." : System.Collections.IEnumerator
41+
member _.GetEnumerator () = invalidOp "Key set is potentially infinite." : IEnumerator<KeyValuePair<'TKey,'TValue>>
42+
member _.IsReadOnly = true
43+
member _.Values = icollection source
44+
member _.Item
45+
with get (_key: 'TKey) : 'TValue = source
46+
and set (_key: 'TKey) (_: 'TValue) : unit = raise (System.NotImplementedException())
47+
48+
member _.Add (_key: 'TKey, _value: 'TValue) : unit = raise (System.NotImplementedException())
49+
member _.Add (_item: KeyValuePair<'TKey,'TValue>) : unit = raise (System.NotImplementedException())
50+
member _.Clear () : unit = raise (System.NotImplementedException())
51+
member _.CopyTo (_arr: KeyValuePair<'TKey,'TValue> [], _arrayIndex: int) : unit = raise (System.NotImplementedException())
52+
member _.Keys : ICollection<'TKey> = raise (System.NotImplementedException())
53+
member _.Remove (_key: 'TKey) : bool = raise (System.NotImplementedException())
54+
member _.Remove (_item: KeyValuePair<'TKey,'TValue>) : bool = raise (System.NotImplementedException())
55+
(*
56+
interface IReadOnlyDictionary<'TKey, 'TValue> with
57+
member _.TryGetValue (_key: 'TKey, value: byref<'TValue>) = value <- source; true
58+
member _.Count =
59+
if typeof<'TKey>.IsValueType then
60+
if typeof<'TKey> = typeof<bool> then 2
61+
else
62+
let s = sizeof<'TKey>
63+
if s < 4 then pown 2 (sizeof<'TKey> * 8)
64+
else -1
65+
elif typeof<'TKey> = typeof<unit> then 1
66+
else -1
67+
member _.ContainsKey (_key: 'TKey) = true
68+
// member _.Contains (item: KeyValuePair<'TKey,'TValue>) = obj.ReferenceEquals (item.Value, source)
69+
member _.GetEnumerator () = invalidOp "Key set is potentially infinite." : System.Collections.IEnumerator
70+
member _.GetEnumerator () = invalidOp "Key set is potentially infinite." : IEnumerator<KeyValuePair<'TKey,'TValue>>
71+
// member _.IsReadOnly = true
72+
member _.Values = icollection source
73+
member _.Item
74+
with get (_key: 'TKey) : 'TValue = source
75+
// and set (_key: 'TKey) (_: 'TValue) : unit = raise (System.NotImplementedException())
76+
77+
// member _.Add (_key: 'TKey, _value: 'TValue) : unit = raise (System.NotImplementedException())
78+
// member _.Add (_item: KeyValuePair<'TKey,'TValue>) : unit = raise (System.NotImplementedException())
79+
// member _.Clear () : unit = raise (System.NotImplementedException())
80+
// member _.CopyTo (_arr: KeyValuePair<'TKey,'TValue> [], _arrayIndex: int) : unit = raise (System.NotImplementedException())
81+
member _.Keys : IEnumerable<'TKey> = raise (System.NotImplementedException())
82+
member _.Remove (_key: 'TKey) : bool = raise (System.NotImplementedException())
83+
member _.Remove (_item: KeyValuePair<'TKey,'TValue>) : bool = raise (System.NotImplementedException())
84+
*)

0 commit comments

Comments
 (0)