Implement System.Collections.IDictionary for dict #436
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,6 +39,17 @@ module ExtraTopLevelOperators = | |
| t.[RuntimeHelpers.StructBox(k)] <- v | ||
| let d = (t :> IDictionary<_,_>) | ||
| let c = (t :> ICollection<_>) | ||
|
|
||
| let dictEnumerator (a: System.Collections.Generic.IEnumerator<System.Collections.DictionaryEntry>) = | ||
| { new System.Collections.IDictionaryEnumerator with | ||
| member x.Current = a.Current :> obj | ||
| member x.Entry = a.Current | ||
| member x.Key = x.Entry.Key | ||
| member x.Value = x.Entry.Value | ||
| member x.MoveNext () = a.MoveNext() | ||
| member x.Reset () = a.Reset() | ||
| } | ||
|
|
||
| // Give a read-only view of the dictionary | ||
| { new IDictionary<'Key, 'T> with | ||
| member s.Item | ||
|
|
@@ -70,6 +81,78 @@ module ExtraTopLevelOperators = | |
| let key = RuntimeHelpers.StructBox(k) | ||
| if d.ContainsKey(key) then (r <- d.[key]; true) else false | ||
| member s.Remove(k : 'Key) = (raise (NotSupportedException(SR.GetString(SR.thisValueCannotBeMutated))) : bool) | ||
| #if FX_NO_READONLY_COLLECTIONS | ||
| #else | ||
| interface IReadOnlyDictionary<'Key, 'T> with | ||
| member s.Item | ||
| with get x = d.[RuntimeHelpers.StructBox(x)] | ||
| member s.Keys = | ||
| let keys = d.Keys | ||
| { new IEnumerable<'Key> with | ||
| member s.GetEnumerator() = (keys |> Seq.map (fun v -> v.Value)).GetEnumerator() | ||
| interface System.Collections.IEnumerable with | ||
| member s.GetEnumerator() = ((keys |> Seq.map (fun v -> v.Value)) :> System.Collections.IEnumerable).GetEnumerator() } | ||
|
|
||
| member s.Values = | ||
| { new IEnumerable<'T> with | ||
| member s.GetEnumerator() = d.Values.GetEnumerator() | ||
| interface System.Collections.IEnumerable with | ||
| member s.GetEnumerator() = (d.Values :> System.Collections.IEnumerable).GetEnumerator() } | ||
| member s.ContainsKey(k) = d.ContainsKey(RuntimeHelpers.StructBox(k)) | ||
| member s.TryGetValue(k,r) = | ||
| let key = RuntimeHelpers.StructBox(k) | ||
| if d.ContainsKey(key) then (r <- d.[key]; true) else false | ||
|
Contributor
There was a problem hiding this comment. type DictWrapper<'k,'v>(d : Dictionary<_,_>) =
member __.TryGetValue(a : 'k, [<System.Runtime.InteropServices.Out>]b : 'v byref) =
d.TryGetValue(a, &b)Might as well fix above, too. |
||
| interface IReadOnlyCollection<KeyValuePair<'Key, 'T>> with | ||
| member s.Count = c.Count | ||
| #endif | ||
| interface System.Collections.IDictionary with | ||
| member s.IsReadOnly = true | ||
| member s.IsFixedSize = true | ||
| member s.IsSynchronized = true | ||
| member s.Item | ||
| with get x = d.[RuntimeHelpers.StructBox(x :?> 'Key)] :> obj | ||
| and set x v = raise (NotSupportedException(SR.GetString(SR.thisValueCannotBeMutated))) | ||
| member s.Keys = | ||
| let keys = d.Keys | ||
| { new System.Collections.ICollection with | ||
| member s.CopyTo(arr,i) = | ||
|
Contributor
There was a problem hiding this comment. Implementer of Example impl here. |
||
| let mutable n = 0 | ||
| for k in keys do | ||
| arr.SetValue(k.Value,i+n) | ||
| n <- n + 1 | ||
| member s.IsSynchronized = true | ||
| member s.SyncRoot = (t :> System.Collections.ICollection).SyncRoot | ||
| member s.Count = keys.Count | ||
| interface System.Collections.IEnumerable with | ||
| member s.GetEnumerator() = ((keys |> Seq.map (fun v -> v.Value)) :> System.Collections.IEnumerable).GetEnumerator() } | ||
|
|
||
| member s.Values = | ||
| { new System.Collections.ICollection with | ||
| member s.CopyTo(arr,i) = | ||
| let mutable n = 0 | ||
| for k in d.Values do | ||
| arr.SetValue(k,i+n) | ||
| n <- n + 1 | ||
| member s.IsSynchronized = true | ||
| member s.SyncRoot = (t :> System.Collections.ICollection).SyncRoot | ||
| member s.Count = d.Values.Count | ||
| interface System.Collections.IEnumerable with | ||
| member s.GetEnumerator() = (d.Values :> System.Collections.IEnumerable).GetEnumerator() } | ||
| member s.Count = c.Count | ||
| member s.SyncRoot = (t :> System.Collections.ICollection).SyncRoot | ||
| member s.Add(k,v) = raise (NotSupportedException(SR.GetString(SR.thisValueCannotBeMutated))) | ||
| member s.Contains(k) = d.ContainsKey(RuntimeHelpers.StructBox(k :?> 'Key)) | ||
| member s.GetEnumerator() = | ||
| (c |> Seq.map (fun (KeyValue(k,v)) -> System.Collections.DictionaryEntry(k.Value,v))).GetEnumerator() | ||
| |> dictEnumerator | ||
|
|
||
| member s.Remove(k) = (raise (NotSupportedException(SR.GetString(SR.thisValueCannotBeMutated))) : unit) | ||
| member s.Clear() = raise (NotSupportedException(SR.GetString(SR.thisValueCannotBeMutated))); | ||
| member s.CopyTo(arr,i) = | ||
| let mutable n = 0 | ||
| for (KeyValue(k,v)) in c do | ||
| arr.SetValue(System.Collections.DictionaryEntry(k.Value,v),i+n) | ||
| n <- n + 1 | ||
| interface ICollection<KeyValuePair<'Key, 'T>> with | ||
| member s.Add(x) = raise (NotSupportedException(SR.GetString(SR.thisValueCannotBeMutated))); | ||
| member s.Clear() = raise (NotSupportedException(SR.GetString(SR.thisValueCannotBeMutated))); | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FX_ATLEAST_45 is not enough? IReadOnlyDictionary msdn
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
had to exclude portable
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FSHARP_CORE_PORTABLE? because there are really a lot of defines already.
i mean
FX_ATLEAST_45 && (!FSHARP_CORE_PORTABLE)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if FX_ATLEAST_45 && not FSHARP_CORE_PORTABLE
but why not explicitly exlude with ne flag. seems like a common pattern here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
there are already lot of defines, and is going to be messier with netcore.
i dont think the best long term is one define per class, instead we should simplify the codebase and build permutations
Another factor is: if you undefine FX_NO_READONLY_COLLECTIONS, that's not enogh to compile if the class doesn't exists in the framework. Is not a pure feature flag (like
WSDLdefine )but that's my idea /cc @dsyme
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please use feature-based defines (FX_NO_READONLY_COLLECTIONS) rather than platform defines (FX_ATLEAST_45, FSHARP_CORE_PORTABLE). Granularity of "features" is up to you - merge related ones where possible, split where necessary,
thanks
Don
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thx for reply @dsyme nice to know 😄