Move up non-generic collection types and add debug view.

Assets/Cryville/Common/Collections/Generic/IPairList.cs

@@ -1,12 +1,7 @@
-using System.Collections;
+using System.Collections.Generic;
-using System.Collections.Generic;
 
 namespace Cryville.Common.Collections.Generic {
-	public interface IPairList : IList {
+	public interface IPairList<TKey, TValue> : IList<KeyValuePair<TKey, TValue>> {
-		void Add(object key, object value);
-		void Insert(int index, object key, object value);
-	}
-	public interface IPairList<TKey, TValue> : IList<KeyValuePair<TKey, TValue>>, IPairList {
 		void Add(TKey key, TValue value);
 		void Insert(int index, TKey key, TValue value);
 	}

Assets/Cryville/Common/Collections/Generic/PairCollection.cs

@@ -1,23 +1,9 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
 
 namespace Cryville.Common.Collections.Generic {
-	public struct PairCollection : IDisposable {
+	[DebuggerDisplay("Count = {Count}"), DebuggerTypeProxy(typeof(PairCollectionDebugView<,>))]
-		public void Dispose() { }
-		readonly IPairList _pairList;
-		readonly IDictionary _dictionary;
-		public PairCollection(object collection) : this() {
-			var type = collection.GetType();
-			if (typeof(IPairList).IsAssignableFrom(type)) _pairList = (IPairList)collection;
-			else if (typeof(IDictionary).IsAssignableFrom(type)) _dictionary = (IDictionary)collection;
-			else throw new ArgumentException("Parameter is not a pair collection");
-		}
-		public void Add(object key, object value) {
-			if (_pairList != null) _pairList.Add(key, value);
-			else _dictionary.Add(key, value);
-		}
-	}
 	public struct PairCollection<TKey, TValue> : IDisposable {
 		public void Dispose() { }
 		readonly IPairList<TKey, TValue> _pairList;
@@ -28,9 +14,33 @@ namespace Cryville.Common.Collections.Generic {
 			else if (typeof(IDictionary<TKey, TValue>).IsAssignableFrom(type)) _dictionary = (IDictionary<TKey, TValue>)collection;
 			else throw new ArgumentException("Parameter is not a pair collection");
 		}
+		public int Count {
+			get {
+				if (_pairList != null) return _pairList.Count;
+				else return _dictionary.Count;
+			}
+		}
 		public void Add(TKey key, TValue value) {
 			if (_pairList != null) _pairList.Add(key, value);
 			else _dictionary.Add(key, value);
 		}
+		public void CopyTo(KeyValuePair<TKey, TValue>[] array, int index) {
+			if (_pairList != null) _pairList.CopyTo(array, index);
+			else _dictionary.CopyTo(array, index);
+		}
+	}
+	internal class PairCollectionDebugView<TKey, TValue> {
+		readonly PairCollection<TKey, TValue> _self;
+		public PairCollectionDebugView(PairCollection<TKey, TValue> self) {
+			_self = self;
+		}
+		[DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
+		public KeyValuePair<TKey, TValue>[] Items {
+			get {
+				KeyValuePair<TKey, TValue>[] array = new KeyValuePair<TKey, TValue>[_self.Count];
+				_self.CopyTo(array, 0);
+				return array;
+			}
+		}
 	}
 }

Assets/Cryville/Common/Collections/Generic/PairList.cs

@@ -1,17 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 
 namespace Cryville.Common.Collections.Generic {
-	public class PairList : List<KeyValuePair<object, object>>, IPairList {
+	[DebuggerDisplay("Count = {Count}"), DebuggerTypeProxy(typeof(PairListDebugView<,>))]
-		public void Add(object key, object value) {
+	public class PairList<TKey, TValue> : List<KeyValuePair<TKey, TValue>>, IPairList<TKey, TValue>, IPairList {
-			Add(new KeyValuePair<object, object>(key, value));
-		}
-
-		public void Insert(int index, object key, object value) {
-			Insert(index, new KeyValuePair<object, object>(key, value));
-		}
-	}
-	public class PairList<TKey, TValue> : List<KeyValuePair<TKey, TValue>>, IPairList<TKey, TValue> {
 		public void Add(TKey key, TValue value) {
 			Add(new KeyValuePair<TKey, TValue>(key, value));
 		}
@@ -38,4 +31,18 @@ namespace Cryville.Common.Collections.Generic {
 			}
 		}
 	}
+	internal class PairListDebugView<TKey, TValue> {
+		readonly PairList<TKey, TValue> _self;
+		public PairListDebugView(PairList<TKey, TValue> self) {
+			_self = self;
+		}
+		[DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
+		public KeyValuePair<TKey, TValue>[] Items {
+			get {
+				KeyValuePair<TKey, TValue>[] array = new KeyValuePair<TKey, TValue>[_self.Count];
+				_self.CopyTo(array, 0);
+				return array;
+			}
+		}
+	}
 }

Assets/Cryville/Common/Collections/IPairList.cs

@@ -0,0 +1,8 @@
+using System.Collections;
+
+namespace Cryville.Common.Collections {
+	public interface IPairList : IList {
+		void Add(object key, object value);
+		void Insert(int index, object key, object value);
+	}
+}

Assets/Cryville/Common/Collections/IPairList.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 046617672d437de4ab7e644a55defd3b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Common/Collections/PairCollection.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Cryville.Common.Collections {
+	[DebuggerDisplay("Count = {Count}"), DebuggerTypeProxy(typeof(PairCollectionDebugView))]
+	public struct PairCollection : IDisposable {
+		public void Dispose() { }
+		readonly IPairList _pairList;
+		readonly IDictionary _dictionary;
+		public PairCollection(object collection) : this() {
+			var type = collection.GetType();
+			if (typeof(IPairList).IsAssignableFrom(type)) _pairList = (IPairList)collection;
+			else if (typeof(IDictionary).IsAssignableFrom(type)) _dictionary = (IDictionary)collection;
+			else throw new ArgumentException("Parameter is not a pair collection");
+		}
+		public int Count {
+			get {
+				if (_pairList != null) return _pairList.Count;
+				else return _dictionary.Count;
+			}
+		}
+		public void Add(object key, object value) {
+			if (_pairList != null) _pairList.Add(key, value);
+			else _dictionary.Add(key, value);
+		}
+		public void CopyTo(KeyValuePair<object, object>[] array, int index) {
+			if (_pairList != null) _pairList.CopyTo(array, index);
+			else _dictionary.CopyTo(array, index);
+		}
+	}
+	internal class PairCollectionDebugView {
+		readonly PairCollection _self;
+		public PairCollectionDebugView(PairCollection self) {
+			_self = self;
+		}
+		[DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
+		public KeyValuePair<object, object>[] Items {
+			get {
+				KeyValuePair<object, object>[] array = new KeyValuePair<object, object>[_self.Count];
+				_self.CopyTo(array, 0);
+				return array;
+			}
+		}
+	}
+}

Assets/Cryville/Common/Collections/PairCollection.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1f87dfb8f6a1f5640b6deae741cd715c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Common/Collections/PairList.cs

@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Cryville.Common.Collections {
+	[DebuggerDisplay("Count = {Count}"), DebuggerTypeProxy(typeof(PairListDebugView))]
+	public class PairList : List<KeyValuePair<object, object>>, IPairList {
+		public void Add(object key, object value) {
+			Add(new KeyValuePair<object, object>(key, value));
+		}
+
+		public void Insert(int index, object key, object value) {
+			Insert(index, new KeyValuePair<object, object>(key, value));
+		}
+	}
+	internal class PairListDebugView {
+		readonly PairList _self;
+		public PairListDebugView(PairList self) {
+			_self = self;
+		}
+		[DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
+		public KeyValuePair<object, object>[] Items {
+			get {
+				KeyValuePair<object, object>[] array = new KeyValuePair<object, object>[_self.Count];
+				_self.CopyTo(array, 0);
+				return array;
+			}
+		}
+	}
+}

Assets/Cryville/Common/Collections/PairList.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 57fc9f037c1fda5449e2a365a835c82c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Common/Pdt/PdtInterpreter.cs

@@ -1,4 +1,4 @@
-using Cryville.Common.Collections.Generic;
+using Cryville.Common.Collections;
 using System;
 using System.Collections;
 using System.Collections.Generic;