Big fix.

Author: Berrysoft

src/Berrysoft.Data/DebugView.cs

@@ -1,14 +1,13 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 
 namespace Berrysoft.Data
 {
-    internal sealed class MapDebugView<K, V>
+    internal sealed class IMapDebugView<K, V>
     {
-        private readonly Map<K, V> map;
-        public MapDebugView(Map<K, V> map)
+        private readonly IMap<K, V> map;
+        public IMapDebugView(IMap<K, V> map)
         {
             this.map = map ?? throw ExceptionHelper.ArgumentNull(nameof(map));
         }
@@ -23,20 +22,31 @@ public KeyPair<K, V>[] Items
             }
         }
     }
-    internal sealed class LookupDebugView<K, V>
+    internal sealed class IMutableLookupDebugView<K, V>
     {
-        private readonly Lookup<K, V> lookup;
-        public LookupDebugView(Lookup<K, V> lookup)
+        private readonly IMutableLookup<K, V> lookup;
+        public IMutableLookupDebugView(IMutableLookup<K, V> lookup)
         {
             this.lookup = lookup ?? throw ExceptionHelper.ArgumentNull(nameof(lookup));
         }
         [DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
-        public Lookup<K, V>.Grouping[] Items => ((IEnumerable<Lookup<K, V>.Grouping>)lookup).ToArray();
+        public IGrouping<K, V>[] Items => lookup.ToArray();
     }
-    internal sealed class MultiMapDebugView<K, V>
+    internal sealed class ICountableGroupingDebugView<K,V>
     {
-        private readonly MultiMap<K, V> multiMap;
-        public MultiMapDebugView(MultiMap<K, V> multiMap)
+        private readonly ICountableGrouping<K, V> grouping;
+        public ICountableGroupingDebugView(ICountableGrouping<K,V> grouping)
+        {
+            this.grouping = grouping ?? throw ExceptionHelper.ArgumentNull(nameof(grouping));
+        }
+        public K Key => grouping.Key;
+        [DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
+        public V[] Items => grouping.ToArray();
+    }
+    internal sealed class IMultiMapDebugView<K, V>
+    {
+        private readonly IMultiMap<K, V> multiMap;
+        public IMultiMapDebugView(IMultiMap<K, V> multiMap)
         {
             this.multiMap = multiMap ?? throw ExceptionHelper.ArgumentNull(nameof(multiMap));
         }

src/Berrysoft.Data/Lookup.cs

@@ -69,11 +69,11 @@ internal interface ICountableGrouping<TKey, TElement> : IGrouping<TKey, TElement
     /// <typeparam name="TKey">The type of the keys in the <see cref="Lookup{TKey, TElement}"/>.</typeparam>
     /// <typeparam name="TElement">The type of the elements of each value in the <see cref="Lookup{TKey, TElement}"/>.</typeparam>
     [Serializable]
-    [DebuggerTypeProxy(typeof(LookupDebugView<,>))]
+    [DebuggerTypeProxy(typeof(IMutableLookupDebugView<,>))]
     [DebuggerDisplay("Count = {Count}")]
-    public class Lookup<TKey, TElement> : IMutableLookup<TKey, TElement>, IEnumerable<KeyValuePair<TKey, TElement>>, IEnumerable<Lookup<TKey, TElement>.Grouping>
+    public class Lookup<TKey, TElement> : IMutableLookup<TKey, TElement>, IEnumerable<KeyValuePair<TKey, TElement>>, IEnumerable<Grouping<TKey, TElement>>
     {
-        private readonly Dictionary<TKey, Grouping> dic;
+        private readonly Dictionary<TKey, Grouping<TKey, TElement>> dic;
         /// <summary>
         /// Initialize a new instance of <see cref="Lookup{TKey, TElement}"/> class.
         /// </summary>
@@ -101,7 +101,7 @@ public Lookup(IEqualityComparer<TKey> comparer)
         /// <param name="comparer">The comparer of the keys.</param>
         public Lookup(int capacity, IEqualityComparer<TKey> comparer)
         {
-            dic = new Dictionary<TKey, Grouping>(capacity, comparer);
+            dic = new Dictionary<TKey, Grouping<TKey, TElement>>(capacity, comparer);
         }
         /// <summary>
         /// Initialize a new instance of <see cref="Lookup{TKey, TElement}"/> class.
@@ -120,10 +120,10 @@ public Lookup(ILookup<TKey, TElement> lookup, IEqualityComparer<TKey> comparer)
             switch (lookup ?? throw ExceptionHelper.ArgumentNull(nameof(lookup)))
             {
                 case Lookup<TKey, TElement> lkp:
-                    dic = new Dictionary<TKey, Grouping>(lkp.dic, comparer);
+                    dic = new Dictionary<TKey, Grouping<TKey, TElement>>(lkp.dic, comparer);
                     break;
                 default:
-                    dic = new Dictionary<TKey, Grouping>(lookup.Count, comparer);
+                    dic = new Dictionary<TKey, Grouping<TKey, TElement>>(lookup.Count, comparer);
                     foreach (var grouping in lookup)
                     {
                         foreach (var item in grouping)
@@ -145,7 +145,7 @@ public ICollection<TElement> this[TKey key]
             {
                 if (!dic.ContainsKey(key))
                 {
-                    dic[key] = new Grouping(key);
+                    dic[key] = new Grouping<TKey, TElement>(key);
                 }
                 return dic[key];
             }
@@ -167,11 +167,11 @@ public ICollection<TElement> this[TKey key]
         /// </summary>
         /// <param name="key">The specified key.</param>
         /// <param name="element">The specified element.</param>
-        public void Add(TKey key,TElement element)
+        public void Add(TKey key, TElement element)
         {
-            if(!dic.ContainsKey(key))
+            if (!dic.ContainsKey(key))
             {
-                dic[key] = new Grouping(key);
+                dic[key] = new Grouping<TKey, TElement>(key);
             }
             dic[key].AddElement(element);
         }
@@ -241,9 +241,9 @@ public bool TryGetElements(TKey key, out IEnumerable<TElement> elements)
         /// <returns>An enumerator for the <see cref="Lookup{TKey, TElement}"/>.</returns>
         public IEnumerator<KeyValuePair<TKey, TElement>> GetEnumerator()
         {
-            foreach(var grouping in dic)
+            foreach (var grouping in dic)
             {
-                foreach(var item in grouping.Value)
+                foreach (var item in grouping.Value)
                 {
                     yield return new KeyValuePair<TKey, TElement>(grouping.Key, item);
                 }
@@ -258,7 +258,7 @@ public IEnumerator<KeyValuePair<TKey, TElement>> GetEnumerator()
         /// Returns a generic enumerator that iterates through the <see cref="Lookup{TKey, TElement}"/>.
         /// </summary>
         /// <returns>An enumerator for the <see cref="Lookup{TKey, TElement}"/>.</returns>
-        IEnumerator<Grouping> IEnumerable<Grouping>.GetEnumerator() => GetEnumeratorInternal();
+        IEnumerator<Grouping<TKey,TElement>> IEnumerable<Grouping<TKey, TElement>>.GetEnumerator() => GetEnumeratorInternal();
         /// <summary>
         /// Returns an enumerator that iterates through the <see cref="Lookup{TKey, TElement}"/>. This class cannot be inherited.
         /// </summary>
@@ -268,107 +268,110 @@ public IEnumerator<KeyValuePair<TKey, TElement>> GetEnumerator()
         /// Returns a generic enumerator that iterates through the <see cref="Lookup{TKey, TElement}"/>.
         /// </summary>
         /// <returns>An enumerator for the <see cref="Lookup{TKey, TElement}"/>.</returns>
-        internal IEnumerator<Grouping> GetEnumeratorInternal()
+        internal IEnumerator<Grouping<TKey, TElement>> GetEnumeratorInternal()
         {
             foreach (var item in dic)
             {
                 yield return item.Value;
             }
         }
+    }
+    /// <summary>
+    /// Represents a key and a sequence of elements.
+    /// </summary>
+    [Serializable]
+    [DebuggerTypeProxy(typeof(ICountableGroupingDebugView<,>))]
+    [DebuggerDisplay("Count = {Count}")]
+    internal class Grouping<TKey, TElement> : ICountableGrouping<TKey, TElement>, ICollection<TElement>
+    {
+        private readonly TKey key;
+        private readonly Collection<TElement> collection;
         /// <summary>
-        /// Represents a key and a sequence of elements.
+        /// Initialize a new instance of <see cref="Grouping{TKey, TElement}"/> class.
         /// </summary>
-        internal class Grouping : ICountableGrouping<TKey, TElement>, ICollection<TElement>
+        /// <param name="key"></param>
+        public Grouping(TKey key)
         {
-            private readonly TKey key;
-            private readonly Collection<TElement> collection;
-            /// <summary>
-            /// Initialize a new instance of <see cref="Grouping"/> class.
-            /// </summary>
-            /// <param name="key"></param>
-            public Grouping(TKey key)
-            {
-                this.key = key;
-                this.collection = new Collection<TElement>();
-            }
-            /// <summary>
-            /// The key of the <see cref="Grouping"/>.
-            /// </summary>
-            public TKey Key => key;
-            /// <summary>
-            /// Count of the elements.
-            /// </summary>
-            public int Count => collection.Count;
-            /// <summary>
-            /// The <see cref="Grouping"/> is not read-only.
-            /// </summary>
-            public bool IsReadOnly => true;
-            /// <summary>
-            /// Adds element to the grouping.
-            /// </summary>
-            /// <param name="item">The specified element.</param>
-            internal void AddElement(TElement item) => collection.Add(item);
-            /// <summary>
-            /// This function is not supported.
-            /// </summary>
-            /// <param name="item">The specified element.</param>
-            /// <exception cref="NotSupportedException"/>
-            public void Add(TElement item) => throw ExceptionHelper.NotSupported();
-            /// <summary>
-            /// Clears the elements.
-            /// </summary>
-            internal void ClearElements() => collection.Clear();
-            /// <summary>
-            /// This function is not supported.
-            /// </summary>
-            /// <exception cref="NotSupportedException"/>
-            public void Clear() => throw ExceptionHelper.NotSupported();
-            /// <summary>
-            /// Removes the specified element.
-            /// </summary>
-            /// <param name="item">The specified element.</param>
-            /// <returns><see langword="true"/> if removes successfully; otherwise, <see langword="false"/>.</returns>
-            internal bool RemoveElement(TElement item) => collection.Remove(item);
-            /// <summary>
-            /// This function is not supported.
-            /// </summary>
-            /// <param name="item">The specified element.</param>
-            /// <returns><see langword="true"/> if removes successfully; otherwise, <see langword="false"/>.</returns>
-            /// <exception cref="NotSupportedException"/>
-            public bool Remove(TElement item) => throw ExceptionHelper.NotSupported();
-            /// <summary>
-            /// Determines whether a specified key is in the <see cref="Grouping"/>.
-            /// </summary>
-            /// <param name="item">The element to find in the <see cref="Grouping"/>.</param>
-            /// <returns><see langword="true"/> if <paramref name="item"/> is in the <see cref="Grouping"/>; otherwise, <see langword="false"/>.</returns>
-            public bool Contains(TElement item) => collection.Contains(item);
-            /// <summary>
-            /// Copies the entire <see cref="Collection{T}"/> to a compatible one-dimensional <see cref="Array"/>, starting at the specified index of the target array.
-            /// </summary>
-            /// <param name="array">The one-dimensional <see cref="Array"/> that is the destination of the elements copied from <see cref="Collection{T}"/>. The <see cref="Array"/> must have zero-based indexing.</param>
-            /// <param name="arrayIndex">The zero-based index in array at which copying begins.</param>
-            public void CopyTo(TElement[] array, int arrayIndex)
-            {
-                if (array == null)
-                    throw ExceptionHelper.ArgumentNull(nameof(array));
-                if (arrayIndex < 0)
-                    throw ExceptionHelper.ArgumentOutOfRange(nameof(arrayIndex));
-                if (arrayIndex > array.Length)
-                    throw ExceptionHelper.ArgumentOutOfRange(nameof(arrayIndex));
-                if (array.Length - arrayIndex < collection.Count)
-                    throw ExceptionHelper.ArrayTooSmall();
-                collection.CopyTo(array, arrayIndex);
-            }
-            /// <summary>
-            /// Returns a generic enumerator that iterates through the <see cref="Grouping"/>.
-            /// </summary>
-            /// <returns>An enumerator for the <see cref="Grouping"/>.</returns>
-            public IEnumerator<TElement> GetEnumerator() => collection.GetEnumerator();
-            /// <summary>
-            /// Returns a generic enumerator that iterates through the <see cref="Grouping"/>.
-            /// </summary>
-            /// <returns>An enumerator for the <see cref="Grouping"/>.</returns>
-            IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+            this.key = key;
+            this.collection = new Collection<TElement>();
         }
+        /// <summary>
+        /// The key of the <see cref="Grouping{TKey, TElement}"/>.
+        /// </summary>
+        public TKey Key => key;
+        /// <summary>
+        /// Count of the elements.
+        /// </summary>
+        public int Count => collection.Count;
+        /// <summary>
+        /// The <see cref="Grouping{TKey, TElement}"/> is not read-only.
+        /// </summary>
+        public bool IsReadOnly => true;
+        /// <summary>
+        /// Adds element to the grouping.
+        /// </summary>
+        /// <param name="item">The specified element.</param>
+        internal void AddElement(TElement item) => collection.Add(item);
+        /// <summary>
+        /// This function is not supported.
+        /// </summary>
+        /// <param name="item">The specified element.</param>
+        /// <exception cref="NotSupportedException"/>
+        public void Add(TElement item) => throw ExceptionHelper.NotSupported();
+        /// <summary>
+        /// Clears the elements.
+        /// </summary>
+        internal void ClearElements() => collection.Clear();
+        /// <summary>
+        /// This function is not supported.
+        /// </summary>
+        /// <exception cref="NotSupportedException"/>
+        public void Clear() => throw ExceptionHelper.NotSupported();
+        /// <summary>
+        /// Removes the specified element.
+        /// </summary>
+        /// <param name="item">The specified element.</param>
+        /// <returns><see langword="true"/> if removes successfully; otherwise, <see langword="false"/>.</returns>
+        internal bool RemoveElement(TElement item) => collection.Remove(item);
+        /// <summary>
+        /// This function is not supported.
+        /// </summary>
+        /// <param name="item">The specified element.</param>
+        /// <returns><see langword="true"/> if removes successfully; otherwise, <see langword="false"/>.</returns>
+        /// <exception cref="NotSupportedException"/>
+        public bool Remove(TElement item) => throw ExceptionHelper.NotSupported();
+        /// <summary>
+        /// Determines whether a specified key is in the <see cref="Grouping{TKey, TElement}"/>.
+        /// </summary>
+        /// <param name="item">The element to find in the <see cref="Grouping{TKey, TElement}"/>.</param>
+        /// <returns><see langword="true"/> if <paramref name="item"/> is in the <see cref="Grouping{TKey, TElement}"/>; otherwise, <see langword="false"/>.</returns>
+        public bool Contains(TElement item) => collection.Contains(item);
+        /// <summary>
+        /// Copies the entire <see cref="Collection{T}"/> to a compatible one-dimensional <see cref="Array"/>, starting at the specified index of the target array.
+        /// </summary>
+        /// <param name="array">The one-dimensional <see cref="Array"/> that is the destination of the elements copied from <see cref="Collection{T}"/>. The <see cref="Array"/> must have zero-based indexing.</param>
+        /// <param name="arrayIndex">The zero-based index in array at which copying begins.</param>
+        public void CopyTo(TElement[] array, int arrayIndex)
+        {
+            if (array == null)
+                throw ExceptionHelper.ArgumentNull(nameof(array));
+            if (arrayIndex < 0)
+                throw ExceptionHelper.ArgumentOutOfRange(nameof(arrayIndex));
+            if (arrayIndex > array.Length)
+                throw ExceptionHelper.ArgumentOutOfRange(nameof(arrayIndex));
+            if (array.Length - arrayIndex < collection.Count)
+                throw ExceptionHelper.ArrayTooSmall();
+            collection.CopyTo(array, arrayIndex);
+        }
+        /// <summary>
+        /// Returns a generic enumerator that iterates through the <see cref="Grouping{TKey, TElement}"/>.
+        /// </summary>
+        /// <returns>An enumerator for the <see cref="Grouping{TKey, TElement}"/>.</returns>
+        public IEnumerator<TElement> GetEnumerator() => collection.GetEnumerator();
+        /// <summary>
+        /// Returns a generic enumerator that iterates through the <see cref="Grouping{TKey, TElement}"/>.
+        /// </summary>
+        /// <returns>An enumerator for the <see cref="Grouping{TKey, TElement}"/>.</returns>
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
     }
 }

src/Berrysoft.Data/Map.cs

@@ -204,7 +204,7 @@ public override string ToString()
     /// <typeparam name="TKey1">Type of key1.</typeparam>
     /// <typeparam name="TKey2">Type of key2.</typeparam>
     [Serializable]
-    [DebuggerTypeProxy(typeof(MapDebugView<,>))]
+    [DebuggerTypeProxy(typeof(IMapDebugView<,>))]
     [DebuggerDisplay("Count = {Count}")]
     public class Map<TKey1, TKey2> : IMap<TKey1, TKey2>
     {

src/Berrysoft.Data/MultiMap.cs

@@ -156,7 +156,7 @@ public static MultiMap<TKey1, TKey2> ToMultiMap<TSource, TKey1, TKey2>(this IEnu
     /// <typeparam name="TKey1">Type of key1.</typeparam>
     /// <typeparam name="TKey2">Type of key2.</typeparam>
     [Serializable]
-    [DebuggerTypeProxy(typeof(MultiMapDebugView<,>))]
+    [DebuggerTypeProxy(typeof(IMultiMapDebugView<,>))]
     [DebuggerDisplay("Count = {Count}")]
     public class MultiMap<TKey1, TKey2> : IMultiMap<TKey1, TKey2>
     {

src/Berrysoft.Unsafe/ByReference.cs

@@ -32,20 +32,4 @@ public ref T Value
             get => ref AsRef<T>(_ptr);
         }
     }
-    [DebuggerDisplay("{Value}")]
-    [DebuggerTypeProxy(typeof(PointerDebugView<>))]
-    public readonly unsafe struct ReadOnlyRefrence<T>
-    {
-        private readonly void* _ptr;
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ReadOnlyRefrence(in T value)
-        {
-            _ptr = AsPointer(ref AsRef(in value));
-        }
-        public ref readonly T Value
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => ref AsRef<T>(_ptr);
-        }
-    }
 }

src/Berrysoft.Unsafe/PointerDebugView.cs

@@ -33,10 +33,6 @@ public PointerDebugView(ByReference<T> ptr)
         {
             target = ptr.Value;
         }
-        public PointerDebugView(ReadOnlyRefrence<T> ptr)
-        {
-            target = ptr.Value;
-        }
         /// <summary>
         /// Target of the pointer.
         /// </summary>