Cleanup.

Author: electricessence

Benchmarks/EnumParseTests.cs

@@ -42,7 +42,7 @@ public Greek EnumParse()
 
 		private static bool TryParseBySwitch(string value, bool ignoreCase, out Greek e)
 		{
-			if(ignoreCase)
+			if (ignoreCase)
 			{
 				if (value.Equals(nameof(Greek.Alpha), StringComparison.OrdinalIgnoreCase))
 				{
@@ -149,7 +149,7 @@ private static bool TryParseBySwitch(string value, bool ignoreCase, out Greek e)
 		private static bool TryParseByLengthSwitch(string value, bool ignoreCase, out Greek e)
 		{
 			var len = value.Length;
-			switch(len)
+			switch (len)
 			{
 				case 3:
 					if (value.Equals(nameof(Greek.Phi), ignoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal))

Benchmarks/Greek.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Open.Text.Benchmarks
+namespace Open.Text.Benchmarks
 {
 	public enum Greek
 	{

Benchmarks/Program.cs

@@ -1,5 +1,5 @@
-using Open.Text.Benchmarks;
-using BenchmarkDotNet.Running;
+using BenchmarkDotNet.Running;
+using Open.Text.Benchmarks;
 
 //BenchmarkRunner.Run<EnumParseTests>();
 BenchmarkRunner.Run<EnumToStringTests>();

Source/EnumValue.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Linq;
 using System.Linq.Expressions;
@@ -62,7 +61,7 @@ static Func<TEnum, string> GetEnumNameDelegate()
 					),
 					null,
 					Enum.GetValues(tEnum).Cast<Object>().Select(v => Expression.SwitchCase(
-					  Expression.Constant(v.ToString()),
+					  Expression.Constant(string.Intern(v.ToString())),
 					  Expression.Constant(v)
 					)).ToArray()
 				  )
@@ -80,7 +79,7 @@ static Func<TEnum, string> GetEnumNameDelegate()
 
 			foreach (var e in values)
 			{
-				var n = e.ToString();
+				var n = string.Intern(e.ToString());
 				var len = n.Length;
 				if (len > longest) longest = len;
 				if (!d.TryGetValue(len, out var v)) d.Add(len, v = new());
@@ -94,11 +93,6 @@ static Func<TEnum, string> GetEnumNameDelegate()
 			return result;
 		}
 
-		static ImmutableSortedDictionary<TEnum, string> CreateNameLookup()
-			=> Enum.GetValues(typeof(TEnum))
-				.Cast<TEnum>()
-				.ToImmutableSortedDictionary(v => v, v => v.ToString());
-
 		/// <summary>
 		/// Indicates whether this instance matches the enum value of <paramref name="other"/>.
 		/// </summary>
@@ -171,15 +165,7 @@ public EnumValueCaseIgnored(string value)
 		public TEnum Value { get; }
 
 		/// <inheritdoc cref="EnumValue{TEnum}.ToString"/>
-		public override string ToString() => Value.ToString();
-
-		internal static readonly ImmutableDictionary<string, TEnum> Lookup = CreateLookup();
-
-		static ImmutableDictionary<string, TEnum> CreateLookup()
-			=> Enum
-				.GetValues(typeof(TEnum))
-				.Cast<TEnum>()
-				.ToImmutableDictionary(v => v.ToString(), v => v, StringComparer.OrdinalIgnoreCase);
+		public override string ToString() => EnumValue<TEnum>.NameLookup(Value);
 
 		/// <inheritdoc cref="EnumValue{TEnum}.Equals(EnumValue{TEnum})"/>
 		public bool Equals(EnumValue<TEnum> other) => Value.Equals(other.Value);
@@ -270,11 +256,11 @@ public static bool TryParse<TEnum>(string value, bool ignoreCase, out TEnum e)
 			if (r is null) goto notFound;
 
 			var sc = ignoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
-			foreach (var item in r)
+			foreach (var (Name, Value) in r)
 			{
-				if (item.Name.Equals(value, sc))
+				if (Name.Equals(value, sc))
 				{
-					e = item.Value;
+					e = Value;
 					return true;
 				}
 			}

Source/Extensions.Split.cs

@@ -371,29 +371,29 @@ public static IReadOnlyList<string> Split(this ReadOnlySpan<char> source,
 					return ImmutableArray<string>.Empty;
 
 				case StringSplitOptions.RemoveEmptyEntries:
-				{
-					Debug.Assert(!source.IsEmpty);
-					var list = new List<string>();
-
-				loop:
-					var result = source.FirstSplit(splitCharacter, out var nextIndex);
-					if (!result.IsEmpty) list.Add(result.ToString());
-					if (nextIndex == -1) return list;
-					source = source.Slice(nextIndex);
-					goto loop;
-				}
+					{
+						Debug.Assert(!source.IsEmpty);
+						var list = new List<string>();
+
+					loop:
+						var result = source.FirstSplit(splitCharacter, out var nextIndex);
+						if (!result.IsEmpty) list.Add(result.ToString());
+						if (nextIndex == -1) return list;
+						source = source.Slice(nextIndex);
+						goto loop;
+					}
 
 				default:
-				{
-					Debug.Assert(!source.IsEmpty);
-					var list = new List<string>();
-				loop:
-					var result = source.FirstSplit(splitCharacter, out var nextIndex);
-					list.Add(result.IsEmpty ? string.Empty : result.ToString());
-					if (nextIndex == -1) return list;
-					source = source.Slice(nextIndex);
-					goto loop;
-				}
+					{
+						Debug.Assert(!source.IsEmpty);
+						var list = new List<string>();
+					loop:
+						var result = source.FirstSplit(splitCharacter, out var nextIndex);
+						list.Add(result.IsEmpty ? string.Empty : result.ToString());
+						if (nextIndex == -1) return list;
+						source = source.Slice(nextIndex);
+						goto loop;
+					}
 			}
 		}
 
@@ -419,29 +419,29 @@ public static IReadOnlyList<string> Split(this ReadOnlySpan<char> source,
 					return ImmutableArray<string>.Empty;
 
 				case StringSplitOptions.RemoveEmptyEntries:
-				{
-					Debug.Assert(!source.IsEmpty);
-					var list = new List<string>();
-
-				loop:
-					var result = source.FirstSplit(splitSequence, out var nextIndex, comparisonType);
-					if (!result.IsEmpty) list.Add(result.ToString());
-					if (nextIndex == -1) return list;
-					source = source.Slice(nextIndex);
-					goto loop;
-				}
+					{
+						Debug.Assert(!source.IsEmpty);
+						var list = new List<string>();
+
+					loop:
+						var result = source.FirstSplit(splitSequence, out var nextIndex, comparisonType);
+						if (!result.IsEmpty) list.Add(result.ToString());
+						if (nextIndex == -1) return list;
+						source = source.Slice(nextIndex);
+						goto loop;
+					}
 
 				default:
-				{
-					Debug.Assert(!source.IsEmpty);
-					var list = new List<string>();
-				loop:
-					var result = source.FirstSplit(splitSequence, out var nextIndex, comparisonType);
-					list.Add(result.IsEmpty ? string.Empty : result.ToString());
-					if (nextIndex == -1) return list;
-					source = source.Slice(nextIndex);
-					goto loop;
-				}
+					{
+						Debug.Assert(!source.IsEmpty);
+						var list = new List<string>();
+					loop:
+						var result = source.FirstSplit(splitSequence, out var nextIndex, comparisonType);
+						list.Add(result.IsEmpty ? string.Empty : result.ToString());
+						if (nextIndex == -1) return list;
+						source = source.Slice(nextIndex);
+						goto loop;
+					}
 			}
 		}
 	}